Skip to content

Update CropHelper.java #10

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
luckyjmcc wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update CropHelper.java #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dde7f5
fix(Crop): On some devices crop action always return RESULT_CANCEL
ryanhoo Sep 29, 2015
5eb3a9c
feat(CropParams): Add a constructor for convenience
ryanhoo Sep 29, 2015
eaf04cf
update(Version): v3.0.1
ryanhoo Sep 29, 2015
b4acad0
Update CropHelper.java
Oct 15, 2015
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 @@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'

version = "3.0.0"
version = "3.0.1"
android {
compileSdkVersion 20
buildToolsVersion "20.0.0"
Expand All @@ -12,7 +12,7 @@ android {
defaultConfig {
minSdkVersion 8
targetSdkVersion 20
versionCode 15
versionCode 16
versionName version
}
buildTypes {
Expand Down
15 changes: 9 additions & 6 deletions library/src/main/java/org/hybridsquad/android/library/CropHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,18 @@ private static void onPhotoCropped(CropHandler handler, CropParams cropParams) {
// None-Crop Intents

public static Intent buildGalleryIntent(CropParams params) {
Intent intent;
if (params.enable) {
Intent intent;
/*if (params.enable) {
intent = buildCropIntent(Intent.ACTION_GET_CONTENT, params);
} else {
intent = new Intent(Intent.ACTION_GET_CONTENT)
.setType("image/*")
.setType("image*//*")
.putExtra(MediaStore.EXTRA_OUTPUT, params.uri);
}
}*/

intent = new Intent(Intent.ACTION_GET_CONTENT)
.setType("image/*")
.putExtra(MediaStore.EXTRA_OUTPUT, params.uri);
return intent;
}

Expand All @@ -161,8 +165,7 @@ private static Intent buildCropIntent(String action, CropParams params) {
.putExtra("return-data", params.returnData)
.putExtra("outputFormat", params.outputFormat)
.putExtra("noFaceDetection", params.noFaceDetection)
.putExtra("scaleUpIfNeeded", params.scaleUpIfNeeded)
.putExtra(MediaStore.EXTRA_OUTPUT, params.uri);
.putExtra("scaleUpIfNeeded", params.scaleUpIfNeeded);
}

// Clear Cache
Expand Down
6 changes: 6 additions & 0 deletions library/src/main/java/org/hybridsquad/android/library/CropParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ public CropParams(Context context) {
refreshUri();
}

public CropParams(Context context, boolean cropEnabled, boolean compressEnabled) {
this(context);
enable = cropEnabled;
compress = compressEnabled;
}

public void refreshUri() {
uri = CropHelper.generateUri();
}
Expand Down