diff --git a/build.gradle b/build.gradle index ac702f5..a7c210c 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:1.5.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' // NOTE: Do not place your application dependencies here; they belong diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java index b26d458..ae34740 100644 --- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java +++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java @@ -46,8 +46,8 @@ public class PickerActivity extends AppCompatActivity { public static final String KEY_ACTION_BAR_TITLE = "actionBarKey"; public static final String KEY_SHOULD_SHOW_ACTIONBAR_UP = "shouldShowUpKey"; - public static final String CAPTURED_IMAGES_ALBUM_NAME = "captured_images"; - public static final String CAPTURED_IMAGES_DIR = Environment.getExternalStoragePublicDirectory(CAPTURED_IMAGES_ALBUM_NAME).getAbsolutePath(); + public static String CAPTURED_IMAGES_ALBUM_NAME = "captured_images"; + public static String CAPTURED_IMAGES_DIR = Environment.getExternalStoragePublicDirectory(CAPTURED_IMAGES_ALBUM_NAME).getAbsolutePath(); private static final int REQUEST_PORTRAIT_RFC = 1337; private static final int REQUEST_PORTRAIT_FFC = REQUEST_PORTRAIT_RFC + 1; public static ArrayList sCheckedImages = new ArrayList<>(); @@ -56,6 +56,7 @@ public class PickerActivity extends AppCompatActivity { private com.melnykov.fab.FloatingActionButton mDoneFab; private Picker mPickOptions; + //For ViewPager private ImageEntry mCurrentlyDisplayedImage; private AlbumEntry mSelectedAlbum; @@ -76,12 +77,14 @@ protected void onCreate(Bundle savedInstanceState) { mPickOptions = (EventBus.getDefault().getStickyEvent(Events.OnPublishPickOptionsEvent.class)).options; initTheme(); super.onCreate(savedInstanceState); + setContentView(R.layout.activity_pick); addToolbarToLayout(); initActionbar(savedInstanceState); setupAlbums(savedInstanceState); initFab(); updateFab(); + initCaptureImagesDir(); } @Override @@ -254,6 +257,14 @@ public void onClick(DialogInterface dialog, int which) { } + private void initCaptureImagesDir() { + if (mPickOptions.mCameraImagePath != null) { + CAPTURED_IMAGES_ALBUM_NAME = mPickOptions.mCameraImagePath; + CAPTURED_IMAGES_DIR = Environment.getExternalStoragePublicDirectory(CAPTURED_IMAGES_ALBUM_NAME).getAbsolutePath(); + } + Log.d("ImagesFolder", CAPTURED_IMAGES_DIR); + } + public void capturePhoto() { final File captureImageFile = createTemporaryFileForCapturing(".png"); CameraSupport.startPhotoCaptureActivity(this, captureImageFile, REQUEST_PORTRAIT_FFC); diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java index 3fcbdd8..22ec440 100644 --- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java +++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java @@ -1,8 +1,10 @@ package net.yazeed44.imagepicker.util; +import android.annotation.TargetApi; import android.content.Context; import android.content.Intent; import android.graphics.Color; +import android.os.Build; import android.support.annotation.ColorInt; import android.support.annotation.ColorRes; import android.support.annotation.NonNull; @@ -43,6 +45,7 @@ public final class Picker { public final int doneFabIconTintColor; public final boolean shouldShowCaptureMenuItem; public final int checkIconTintColor; + public final String mCameraImagePath; public final boolean videosEnabled; public final int videoLengthLimit; public final int videoThumbnailOverlayColor; @@ -69,12 +72,12 @@ private Picker(final Builder builder) { doneFabIconTintColor = builder.mDoneFabIconTintColor; shouldShowCaptureMenuItem = builder.mShouldShowCaptureMenuItem; checkIconTintColor = builder.mCheckIconTintColor; + mCameraImagePath = builder.mCameraImagePath; videosEnabled = builder.mVideosEnabled; videoLengthLimit = builder.mVideoLengthLimit; videoThumbnailOverlayColor = builder.mVideoThumbnailOverlayColor; videoIconTintColor = builder.mVideoIconTintColor; backBtnInMainActivity = builder.mBackBtnInMainActivity; - } public void startActivity() { @@ -82,9 +85,9 @@ public void startActivity() { EventBus.getDefault().postSticky(new Events.OnPublishPickOptionsEvent(this)); final Intent intent = new Intent(context, PickerActivity.class); + intent.putExtra("camera_image_path", mCameraImagePath); context.startActivity(intent); - } @@ -121,6 +124,7 @@ public static class Builder { private int mCaptureItemIconTintColor; private boolean mShouldShowCaptureMenuItem; private int mCheckIconTintColor; + private String mCameraImagePath; private boolean mVideosEnabled; private int mVideoLengthLimit; private int mVideoThumbnailOverlayColor; @@ -160,6 +164,7 @@ private void init() { mAlbumBackgroundColor = getColor(R.color.alter_album_background); mAlbumNameTextColor = getColor(R.color.alter_album_name_text_color); mAlbumImagesCountTextColor = getColor(R.color.alter_album_images_count_text_color); + mFabBackgroundColorWhenPressed = ColorUtils.setAlphaComponent(mFabBackgroundColor, (int) (android.graphics.Color.alpha(mFabBackgroundColor) * 0.8f)); mPickMode = PickMode.MULTIPLE_IMAGES; @@ -271,6 +276,11 @@ public Picker.Builder setCheckIconTintColor(@ColorInt final int color) { return this; } + public Picker.Builder setCapturesImageDir(final String path) { + mCameraImagePath = path; + return this; + } + public Picker.Builder setBackBtnInMainActivity(final boolean backBtn) { mBackBtnInMainActivity = backBtn; return this; @@ -299,7 +309,5 @@ public Picker.Builder setVideoIconTintColor(@ColorInt final int color) { public Picker build() { return new Picker(this); } - - } }