Skip to content
This repository was archived by the owner on May 27, 2025. It is now read-only.

Added upload multiple images from local storage feature #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added upload multiple images from local storage feature #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
240 changes: 137 additions & 103 deletions flutter-app/lib/camera.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_storage/firebase_storage.dart';
import 'package:flutter/material.dart';
import 'package:path_provider/path_provider.dart';
import 'package:multi_media_picker/multi_media_picker.dart';

import 'countdown_timer.dart';
import 'models.dart';
Expand All @@ -38,14 +39,21 @@ class Camera extends StatefulWidget {
final String label;
final String labelKey;
final UserModel userModel;

Camera(this.dataset, this.label, this.labelKey, this.userModel);
final bool isUploading;
List<File> resultList;
Camera(this.dataset, this.label, this.labelKey, this.userModel,
this.isUploading);

Future init() async {
try {
cameras = await availableCameras();
} on CameraException catch (e) {
logError(e.code, e.description);
if (!isUploading) {
try {
cameras = await availableCameras();
} on CameraException catch (e) {
logError(e.code, e.description);
}
} else {
resultList =
await MultiMediaPicker.pickImages(source: ImageSource.gallery);
}
}

Expand All @@ -67,12 +75,14 @@ class _CameraState extends State<Camera> {
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {
for (CameraDescription cameraDescription in cameras) {
if (cameraDescription.lensDirection == CameraLensDirection.back)
onNewCameraSelected(cameraDescription);
}
});
if (!widget.isUploading) {
WidgetsBinding.instance.addPostFrameCallback((_) {
for (CameraDescription cameraDescription in cameras) {
if (cameraDescription.lensDirection == CameraLensDirection.back)
onNewCameraSelected(cameraDescription);
}
});
}
}

@override
Expand All @@ -83,54 +93,74 @@ class _CameraState extends State<Camera> {

@override
Widget build(BuildContext context) {
if (widget.isUploading && widget.resultList != null) {
widget.resultList
.forEach((eachImage) => {uploadImageToStorage(eachImage.path)});
}
return Scaffold(
key: _scaffoldKey,
appBar: AppBar(
backgroundColor: Theme.of(context).accentColor,
title: Text('Capture sample for ${widget.label}'),
),
body: Container(
decoration: new BoxDecoration(color: Colors.black),
child: Column(
children: <Widget>[
Expanded(
child: Container(
child: Padding(
padding: const EdgeInsets.all(1.0),
child: Center(
child: _cameraPreviewWidget(),
),
),
decoration: BoxDecoration(
color: Colors.black,
border: Border.all(
color:
controller != null && controller.value.isRecordingVideo
? Colors.redAccent
: Colors.black45,
width: 2.0,
),
),
body: widget.isUploading
? Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Text('Uploading Images in the background'),
MaterialButton(
onPressed: () {
Navigator.pop(context);
},
child: Text('OK'),
)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be a snackbar or a dialog instead? IMO, we can just navigate to the previous screen & show a snackbar informing user that images are being uploaded in the background.

],
),
),
new CameraControlWidget(
controller: controller,
onRecordingStart: onVideoRecordButtonPressed,
onRecordingStop: onStopButtonPressed,
onPictureTaken: onTakePictureButtonPressed,
),
Padding(
padding: const EdgeInsets.all(5.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
)
: Container(
decoration: new BoxDecoration(color: Colors.black),
child: Column(
children: <Widget>[
_thumbnailWidget(),
Expanded(
child: Container(
child: Padding(
padding: const EdgeInsets.all(1.0),
child: Center(
child: _cameraPreviewWidget(),
),
),
decoration: BoxDecoration(
color: Colors.black,
border: Border.all(
color: controller != null &&
controller.value.isRecordingVideo
? Colors.redAccent
: Colors.black45,
width: 2.0,
),
),
),
),
new CameraControlWidget(
controller: controller,
onRecordingStart: onVideoRecordButtonPressed,
onRecordingStop: onStopButtonPressed,
onPictureTaken: onTakePictureButtonPressed,
),
Padding(
padding: const EdgeInsets.all(5.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
_thumbnailWidget(),
],
),
),
],
),
),
],
),
),
);
}

Expand Down Expand Up @@ -200,60 +230,7 @@ class _CameraState extends State<Camera> {

void onTakePictureButtonPressed() async {
final filePath = await takePicture();
final automlStorage = InheritedStorage.of(context).autoMlStorage;

if (mounted) {
setState(() {
imagePath = filePath;
});

final filename =
new DateTime.now().millisecondsSinceEpoch.toString() + '.jpg';

// upload to storage and firestore
final StorageReference ref = automlStorage
.ref()
.child('datasets')
.child(widget.dataset.name)
.child(widget.label)
.child(filename);

final File file = File(filePath).absolute;
// upload the file
StorageUploadTask uploadTask = ref.putFile(
file,
StorageMetadata(
contentType: 'image/jpeg',
customMetadata: <String, String>{'activity': 'imgUpload'},
),
);

final snapshot = await uploadTask.onComplete;
final downloadUrl = await snapshot.ref.getDownloadURL();

Firestore.instance.collection('images').add({
'parent_key': widget.labelKey,
'dataset_parent_key': widget.dataset.id,
'type': toString(SampleType
.TRAIN), // newly created images are categorized as training.
'filename': filename,
'uploadPath':
'datasets/${widget.dataset.name}/${widget.label}/$filename',
'gcsURI': downloadUrl,
'uploader': widget.userModel.user.email,
});

final labelRef =
Firestore.instance.collection('labels').document(widget.labelKey);

// increment count for the label
await Firestore.instance.runTransaction((Transaction tx) async {
DocumentSnapshot snapshot = await tx.get(labelRef);
await tx.update(labelRef, <String, dynamic>{
'total_images': snapshot.data['total_images'] + 1
});
});
}
uploadImageToStorage(filePath);
}

void onVideoRecordButtonPressed() {
Expand Down Expand Up @@ -375,6 +352,63 @@ class _CameraState extends State<Camera> {
logError(e.code, e.description);
showInSnackBar('Error: ${e.code}\n${e.description}');
}

void uploadImageToStorage(String filePath) async {
final automlStorage = InheritedStorage.of(context).autoMlStorage;

if (mounted) {
setState(() {
imagePath = filePath;
});

final filename =
new DateTime.now().millisecondsSinceEpoch.toString() + '.jpg';

// upload to storage and firestore
final StorageReference ref = automlStorage
.ref()
.child('datasets')
.child(widget.dataset.name)
.child(widget.label)
.child(filename);

final File file = File(filePath).absolute;
// upload the file
StorageUploadTask uploadTask = ref.putFile(
file,
StorageMetadata(
contentType: 'image/jpeg',
customMetadata: <String, String>{'activity': 'imgUpload'},
),
);

final snapshot = await uploadTask.onComplete;
final downloadUrl = await snapshot.ref.getDownloadURL();

Firestore.instance.collection('images').add({
'parent_key': widget.labelKey,
'dataset_parent_key': widget.dataset.id,
'type': toString(SampleType
.TRAIN), // newly created images are categorized as training.
'filename': filename,
'uploadPath':
'datasets/${widget.dataset.name}/${widget.label}/$filename',
'gcsURI': downloadUrl,
'uploader': widget.userModel.user.email,
});

final labelRef =
Firestore.instance.collection('labels').document(widget.labelKey);

// increment count for the label
await Firestore.instance.runTransaction((Transaction tx) async {
DocumentSnapshot snapshot = await tx.get(labelRef);
await tx.update(labelRef, <String, dynamic>{
'total_images': snapshot.data['total_images'] + 1
});
});
}
}
}

/// Widget to control start / stop of camera
Expand Down
56 changes: 44 additions & 12 deletions flutter-app/lib/label_samples_grid.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,51 @@ class ListLabelSamples extends StatelessWidget {
preferredSize: new AppBar().preferredSize,
),
floatingActionButton: model.isLoggedIn()
? new FloatingActionButton.extended(
icon: const Icon(Icons.add_a_photo),
label: const Text('Add Images'),
onPressed: () async {
final c = Camera(dataset, labelName, labelKey, model);
await c.init();
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => c,
? Align(
alignment: Alignment.bottomRight,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
new FloatingActionButton.extended(
icon: const Icon(Icons.add_a_photo),
heroTag: 1,
label: const Text('Add Images'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having two buttons doesn't look that great :( Can we use a FAB menu or just use the icon?

onPressed: () async {
final c =
Camera(dataset, labelName, labelKey, model, false);
await c.init();
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => c,
),
);
},
),
);
},
Padding(
padding: const EdgeInsets.all(4.0),
),
new FloatingActionButton.extended(
icon: const Icon(Icons.file_upload),
heroTag: 2,
label: const Text('Upload Images'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets remove the text, and just use the icons? (as shown here)

onPressed: () async {
final c =
Camera(dataset, labelName, labelKey, model, true);
await c.init();
if (c.resultList != null && c.resultList.isNotEmpty) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => c,
),
);
}
},
),
],
),
)
: Container(),
// body of the screen
Expand Down
2 changes: 1 addition & 1 deletion flutter-app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies:
intro_slider: ^1.2.0
url_launcher: ^5.0.2
shared_preferences: ^0.5.2

multi_media_picker: ^0.2.3
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^0.1.2
Expand Down