Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fallback to error when android version is under 21 #4

Merged
merged 5 commits into from
Apr 11, 2019
Merged

fallback to error when android version is under 21 #4

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b23ae72
fallback to error when android version is under 21
Kleak Apr 10, 2019
de29bca
add unknown
Kleak Apr 10, 2019
1416c56
better default text on error
Kleak Apr 10, 2019
79042ec
remove no camera in camera state
Kleak Apr 10, 2019
39ef072
fix camera on android api 16
jaumard Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2"
device_info:
dependency: transitive
description:
name: device_info
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.0+1"
firebase_ml_vision:
dependency: transitive
description:
Expand Down
39 changes: 30 additions & 9 deletions lib/flutter_camera_ml_vision.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,26 @@ import 'dart:typed_data';
import 'dart:ui';

import 'package:camera/camera.dart';
import 'package:device_info/device_info.dart';
import 'package:firebase_ml_vision/firebase_ml_vision.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:path_provider/path_provider.dart';
import 'package:pedantic/pedantic.dart';

part 'utils.dart';

typedef HandleDetection<T> = Future<T> Function(FirebaseVisionImage image);
typedef WidgetBuilder = Widget Function(BuildContext);
typedef Widget ErrorWidgetBuilder(BuildContext context, CameraError error);

enum CameraError {
unknown,
cantInitializeCamera,
androidVersionNotSupported,
noCameraAvailable,
}

enum _CameraState {
loading,
noCamera,
error,
ready,
}
Expand All @@ -28,7 +34,7 @@ class CameraMlVision<T> extends StatefulWidget {
final HandleDetection<T> detector;
final Function(T) onResult;
final WidgetBuilder loadingBuilder;
final WidgetBuilder errorBuilder;
final ErrorWidgetBuilder errorBuilder;

CameraMlVision({
Key key,
Expand All @@ -48,6 +54,7 @@ class CameraMlVisionState<T> extends State<CameraMlVision<T>> {
HandleDetection _detector;
ImageRotation _rotation;
_CameraState _cameraMlVisionState = _CameraState.loading;
CameraError _cameraError = CameraError.unknown;
bool _alreadyCheckingImage = false;
bool _isStreaming = false;
bool _isDeactivate = false;
Expand Down Expand Up @@ -103,9 +110,22 @@ class CameraMlVisionState<T> extends State<CameraMlVision<T>> {
}

Future<void> _initialize() async {
if (Platform.isAndroid) {
final deviceInfo = DeviceInfoPlugin();
final androidInfo = await deviceInfo.androidInfo;
if (androidInfo.version.sdkInt < 21) {
debugPrint('Camera plugin doesn\'t support android under version 21');
_cameraMlVisionState = _CameraState.error;
_cameraError = CameraError.androidVersionNotSupported;
return;
}
}

CameraDescription description = await _getCamera(CameraLensDirection.back);
if (description == null) {
_cameraMlVisionState = _CameraState.noCamera;
_cameraMlVisionState = _CameraState.error;
_cameraError = CameraError.noCameraAvailable;

return;
}
_cameraController = CameraController(description,
Expand All @@ -119,11 +139,13 @@ class CameraMlVisionState<T> extends State<CameraMlVision<T>> {
} catch (ex, stack) {
setState(() {
_cameraMlVisionState = _CameraState.error;
_cameraError = CameraError.cantInitializeCamera;
});
debugPrint('Can\'t initialize camera');
debugPrint('$ex, $stack');
return;
}

setState(() {
_cameraMlVisionState = _CameraState.ready;
});
Expand Down Expand Up @@ -162,11 +184,10 @@ class CameraMlVisionState<T> extends State<CameraMlVision<T>> {
? Center(child: CircularProgressIndicator())
: widget.loadingBuilder(context);
}
if (_cameraMlVisionState == _CameraState.noCamera ||
_cameraMlVisionState == _CameraState.error) {
if (_cameraMlVisionState == _CameraState.error) {
return widget.errorBuilder == null
? Center(child: Text('$_cameraMlVisionState'))
: widget.errorBuilder(context);
? Center(child: Text('$_cameraMlVisionState $_cameraError'))
: widget.errorBuilder(context, _cameraError);
}
return FittedBox(
alignment: Alignment.center,
Expand Down
7 changes: 7 additions & 0 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.14.11"
device_info:
dependency: "direct main"
description:
name: device_info
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.0+1"
firebase_ml_vision:
dependency: "direct main"
description:
Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ dependencies:
path_provider: ^0.5.0+1
camera: ^0.4.3+2
pedantic: ^1.4.0
device_info: ^0.4.0+1

dev_dependencies:
flutter_test:
Expand Down