Skip to content

Fix problems with Gradle version 0.11 #16

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix problems with Gradle version 0.11 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e25c39
Fix Lint error (NewApi).
jschamburger Apr 22, 2014
abe9c0d
Merge pull request #11 from jschamburger/master
mitoyarzun Apr 22, 2014
809b63d
Fix NewApi Lint error (this time for real...).
jschamburger Apr 28, 2014
6cb218d
Merge pull request #14 from jschamburger/master
mitoyarzun Apr 28, 2014
727b5fb
Use current support-v4 library and current build tools to avoid probl…
jschamburger Jun 10, 2014
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
4 changes: 2 additions & 2 deletions library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ repositories {
}

dependencies {
compile 'com.android.support:support-v4:19.0.0'
compile 'com.android.support:support-v4:19.1.0'

compile files('libs/zxing-core-2.3.jar')

}

android {
compileSdkVersion 19
buildToolsVersion "19.0.0"
buildToolsVersion "19.1.0"

sourceSets {
main {
Expand Down
18 changes: 14 additions & 4 deletions library/src/com/welcu/android/zxingfragmentlib/camera/CameraConfigurationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.welcu.android.zxingfragmentlib.camera;

import android.annotation.TargetApi;
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Point;
Expand Down Expand Up @@ -139,15 +140,24 @@ void setDesiredCameraParameters(Camera camera, boolean safeMode) {

private void setOrientation(Camera camera, Camera.Parameters parameters) {
if (view.getWidth() < view.getHeight()){
if (Build.VERSION.SDK_INT==7) {
parameters.set("orientation", "portrait");
parameters.setRotation(90);
if (Build.VERSION.SDK_INT<=7) {
setOrientationBefore8(parameters);
} else {
camera.setDisplayOrientation(90);
setOrientation8(camera);
}
}
}

private void setOrientationBefore8(Camera.Parameters parameters) {
parameters.set("orientation", "portrait");
parameters.setRotation(90);
}

@TargetApi(Build.VERSION_CODES.FROYO)
private void setOrientation8(Camera camera) {
camera.setDisplayOrientation(90);
}

Point getCameraResolution() {
return cameraResolution;
}
Expand Down