Skip to content
This repository has been archived by the owner on Jul 1, 2020. It is now read-only.

Adjust camera preview size #293

Closed
wants to merge 2 commits into from
Closed

Adjust camera preview size #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f202de
Update support library and build tools
WeRockStar Mar 30, 2017
a18ad2c
Fix Huawei camera preview size inefficient
WeRockStar Mar 30, 2017
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
10 changes: 5 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.3.0'
}
}

Expand All @@ -20,7 +20,7 @@ allprojects {
}

ext {
supportLibraryDependency = 'com.android.support:support-v4:23.2.1'
supportLibraryDependency = 'com.android.support:support-v4:25.3.1'
isLibrary = false
}
}
Expand All @@ -30,8 +30,8 @@ subprojects {
ext.pluginContainer = project.getPlugins()
if(ext.pluginContainer.hasPlugin("com.android.application") || ext.pluginContainer.hasPlugin("com.android.library")) {
android {
compileSdkVersion 23
buildToolsVersion '23.0.3'
compileSdkVersion 25
buildToolsVersion '25.0.2'

android {
lintOptions {
Expand All @@ -41,7 +41,7 @@ subprojects {

defaultConfig {
minSdkVersion 9
targetSdkVersion 23
targetSdkVersion 25
versionCode 184
versionName "1.8.4"
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/me/dm7/barcodescanner/core/CameraPreview.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ private Camera.Size getOptimalPreviewSize() {
w = portraitWidth;
}

final double ASPECT_TOLERANCE = 0.1;
final double ASPECT_TOLERANCE = 0.5;
double targetRatio = (double) w / h;
if (sizes == null) return null;

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Dec 30 05:01:23 MST 2015
#Thu Mar 30 15:44:42 ICT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
5 changes: 3 additions & 2 deletions zbar-sample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ dependencies {
//compile project(":zbar")
compile 'me.dm7.barcodescanner:zbar:1.9'
compile supportLibraryDependency
compile 'com.android.support:appcompat-v7:24.1.1'
compile 'com.android.support:design:24.1.1'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
}

android {
defaultConfig {
applicationId "${project.group}.zbar.sample"
}
buildToolsVersion '25.0.2'
}
4 changes: 2 additions & 2 deletions zxing-sample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ dependencies {
//compile project(":zxing")
compile 'me.dm7.barcodescanner:zxing:1.9'
compile supportLibraryDependency
compile 'com.android.support:appcompat-v7:24.1.1'
compile 'com.android.support:design:24.1.1'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
}

android {
Expand Down