Skip to content

Commit

Permalink
MLKit Build (firebase#496)
Browse files Browse the repository at this point in the history
  • Loading branch information
samtstern authored May 12, 2018
1 parent 5a1ffb2 commit 1891e39
Show file tree
Hide file tree
Showing 12 changed files with 71 additions and 10 deletions.
1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ cp mock-google-services.json functions/app/google-services.json
cp mock-google-services.json invites/app/google-services.json
cp mock-google-services.json perf/app/google-services.json
cp mock-google-services.json messaging/app/google-services.json
cp mock-google-services.json mlkit/app/google-services.json
cp mock-google-services.json storage/app/google-services.json

# Install preview deps
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
* displaying extra information). This receives preview frames from the camera at a specified rate,
* sending those frames to child classes' detectors / classifiers as fast as it is able to process.
*/
@SuppressLint("MissingPermission")
public class CameraSource {
@SuppressLint("InlinedApi")
public static final int CAMERA_FACING_BACK = CameraInfo.CAMERA_FACING_BACK;
Expand Down Expand Up @@ -154,6 +155,7 @@ public void release() {
*
* @throws IOException if the camera's preview texture or display could not be initialized
*/
@SuppressLint("MissingPermission")
@RequiresPermission(Manifest.permission.CAMERA)
public synchronized CameraSource start() throws IOException {
if (camera != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.
package com.google.firebase.samples.apps.mlkit;

import android.annotation.SuppressLint;
import android.content.Context;
import android.content.res.Configuration;
import android.util.AttributeSet;
Expand Down Expand Up @@ -79,6 +80,7 @@ public void release() {
}
}

@SuppressLint("MissingPermission")
private void startIfReady() throws IOException {
if (startRequested && surfaceAvailable) {
cameraSource.start(surfaceView.getHolder());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
/** Barcode Detector Demo. */
public class BarcodeScanningProcessor extends VisionProcessorBase<List<FirebaseVisionBarcode>> {

private static final String TAG = "BarcodeScanningProcessor";
private static final String TAG = "BarcodeScanProc";

private final FirebaseVisionBarcodeDetector detector;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
/** Cloud Label Detector Demo. */
public class CloudImageLabelingProcessor
extends VisionProcessorBase<List<FirebaseVisionCloudLabel>> {
private static final String TAG = "CloudImageLabelingProcessor";
private static final String TAG = "CloudImgLabelProc";

private final FirebaseVisionCloudLabelDetector detector;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
/** Cloud Landmark Detector Demo. */
public class CloudLandmarkRecognitionProcessor
extends VisionProcessorBase<List<FirebaseVisionCloudLandmark>> {
private static final String TAG = "CloudLandmarkRecognitionProcessor";
private static final String TAG = "CloudLmkRecProc";

private final FirebaseVisionCloudLandmarkDetector detector;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
public class CloudDocumentTextRecognitionProcessor
extends VisionProcessorBase<FirebaseVisionCloudText> {

private static final String TAG = "CloudDocumentTextRecognitionProcessor";
private static final String TAG = "CloudDocTextRecProc";

private final FirebaseVisionCloudDocumentTextDetector detector;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/** Processor for the cloud text detector demo. */
public class CloudTextRecognitionProcessor extends VisionProcessorBase<FirebaseVisionCloudText> {

private static final String TAG = "CloudTextRecognitionProcessor";
private static final String TAG = "CloudTextRecProc";

private final FirebaseVisionCloudTextDetector detector;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
/** Processor for the text recognition demo. */
public class TextRecognitionProcessor extends VisionProcessorBase<FirebaseVisionText> {

private static final String TAG = "TextRecognitionProcessor";
private static final String TAG = "TextRecProc";

private final FirebaseVisionTextDetector detector;

Expand Down
6 changes: 3 additions & 3 deletions mlkit/app/src/main/res/menu/camera_button_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/select_images_from_local"
android:title="Select image from albumn"
android:title="Select image from album"
android:orderInCategory="100"
android:showAsAction="never" />
app:showAsAction="never" />
<item android:id="@+id/take_photo_using_camera"
android:title="Take photo"
android:orderInCategory="100"
android:showAsAction="never" />
app:showAsAction="never" />
</menu>
56 changes: 56 additions & 0 deletions mock-google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,62 @@
"test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712"
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063",
"client_id": "android:com.google.firebase.samples.apps.mlkit",
"client_type": 1,
"android_client_info": {
"package_name": "com.google.firebase.samples.apps.mlkit",
"certificate_hash": []
}
},
"oauth_client": [
{
"client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.google.firebase.samples.apps.mlkit",
"certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7"
}
},
{
"client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo"
}
],
"services": {
"analytics_service": {
"status": 1
},
"cloud_messaging_service": {
"status": 2,
"apns_config": []
},
"appinvite_service": {
"status": 2,
"other_platform_oauth_client": [
{
"client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com",
"client_type": 3
}
]
},
"google_signin_service": {
"status": 2
},
"ads_service": {
"status": 2,
"test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111",
"test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712"
}
}
}
],
"client_info": [],
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':admob:app', ':analytics:app', ':app-indexing:app', ':auth:app', ':config:app', ':crash:app', ':database:app', ':dynamiclinks:app', ':firestore:app', ':functions:app', ':invites:app', ':messaging:app', ':storage:app'
include ':admob:app', ':analytics:app', ':app-indexing:app', ':auth:app', ':config:app', ':crash:app', ':database:app', ':dynamiclinks:app', ':firestore:app', ':functions:app', ':invites:app', ':messaging:app', ':mlkit:app', ':storage:app'

0 comments on commit 1891e39

Please sign in to comment.