Skip to content

Commit

Permalink
Bug fixed when compress image after pick from gallery or take from ca…
Browse files Browse the repository at this point in the history 
…mera
  • Loading branch information
@dhaval-devstree
dhaval-devstree committed Jan 6, 2021
1 parent db74e40 commit 9cdc66d
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 72 deletions.
5 changes: 4 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ allprojects {
Step 2. Add the dependency
```
dependencies {
implementation 'com.github.dhaval-baldha1812:MediaFilePicker:Tag'
implementation 'com.github.dhaval-baldha1812:MediaFilePicker:release_version'
}
```

Expand Down Expand Up @@ -61,3 +61,6 @@ bottomSheetFilePicker.actionButtonTextColor = R.color.purple_500
bottomSheetFilePicker.cancelButtonTextColor = R.color.white
```

**File Pick Options**


3 changes: 1 addition & 2 deletions app/src/main/java/com/devstree/mediafilepicker/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
bottomSheetFilePicker.cancelButtonBg = R.drawable.button_bg_filled
bottomSheetFilePicker.actionButtonTextColor = R.color.purple_500
bottomSheetFilePicker.cancelButtonTextColor = R.color.white
bottomSheetFilePicker.setMediaListenerCallback(BottomSheetFilePicker.TAKE_ALL, object : MediaPickerCallback {
bottomSheetFilePicker.setMediaListenerCallback(BottomSheetFilePicker.IMAGE, object : MediaPickerCallback {
override fun onPickedSuccess(media: Media?) {
if (media == null) return
Glide
Expand All @@ -51,7 +51,6 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
}
})
bottomSheetFilePicker.show(supportFragmentManager, "take_all")

}
}
}
Expand Down
136 changes: 67 additions & 69 deletions ...ilepicker/src/main/java/com/devstree/mediafilepicker/bottomsheet/BottomSheetFilePicker.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import android.view.View.*
import android.view.ViewGroup
import androidx.annotation.ColorRes
import androidx.annotation.DrawableRes
import com.devstree.mediafilepicker.listener.MediaPickerCallback
import com.devstree.mediafilepicker.R
import com.devstree.mediafilepicker.databinding.BottomSheetCameraDialogBinding
import com.devstree.mediafilepicker.enumeration.MediaType
import com.devstree.mediafilepicker.listener.MediaPickerCallback
import com.devstree.mediafilepicker.model.Media
import com.devstree.mediafilepicker.model.Thumb
import com.devstree.mediafilepicker.utils.FileUtil
Expand All @@ -31,7 +31,6 @@ import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import pub.devrel.easypermissions.AfterPermissionGranted
import pub.devrel.easypermissions.EasyPermissions
import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
import java.io.File

/**
Expand Down Expand Up @@ -249,15 +248,15 @@ open class BottomSheetFilePicker : BaseBottomSheet(), OnClickListener {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (resultCode == Activity.RESULT_OK) {
Thread(Runnable {
Thread {
showProgressBar(true)
try {
processActivityResult(requestCode, data)
} catch (e: Exception) {
e.printStackTrace()
}
showProgressBar(false)
}).start()
}.start()
} else {
MediaLog.e("Activity Result Code $resultCode")
if (directAction) hideBottomSheet()
Expand All @@ -266,87 +265,85 @@ open class BottomSheetFilePicker : BaseBottomSheet(), OnClickListener {

private fun showProgressBar(enable: Boolean) {
if (mediaPickerCallback == null) return
executeOnMain(Runnable { mediaPickerCallback?.showProgressBar(enable) })
executeOnMain({ mediaPickerCallback?.showProgressBar(enable) })
}

private fun processActivityResult(requestCode: Int, intent: Intent?) {
var media: Media? = null
when (requestCode) {
TAKE_PHOTO -> {
try {
if (context == null) return
if (file == null) return
GlobalScope.launch {
GlobalScope.launch {
var media: Media? = null
when (requestCode) {
TAKE_PHOTO -> {
try {
if (context == null) return@launch
if (file == null) return@launch
file = FileUtil.imageCompress(mContext, file!!, MediaType.IMAGE) // image compress
media = Media.create(Thumb.generate(mContext, MediaType.IMAGE, file!!))
} catch (e: Exception) {
e.printStackTrace()
media = null
}
} catch (e: Exception) {
e.printStackTrace()
media = null
}
}
CHOOSE_IMAGE_FROM_GALLERY -> {
CHOOSE_IMAGE_FROM_GALLERY -> {
// file = FileUtil.getNewPath(context, intent.getData(), MediaType.IMAGE);
try {
if (context == null) return
file =
FileUtil.getFileFromUri(mContext, intent!!.data, MediaType.IMAGE)
if (file == null) return
GlobalScope.launch {
try {
if (context == null) return@launch
file =
FileUtil.getFileFromUri(mContext, intent!!.data, MediaType.IMAGE)
if (file == null) return@launch
file = FileUtil.imageCompress(mContext, file!!, MediaType.IMAGE) // image compress
media = Media.create(Thumb.generate(mContext, MediaType.IMAGE, file!!))
} catch (e: Exception) {
e.printStackTrace()
media = null
}
} catch (e: Exception) {
e.printStackTrace()
media = null
}
}
TAKE_VIDEO -> {
if (file != null) media =
Media.create(Thumb.generate(mContext, MediaType.VIDEO, file!!))
}
CHOOSE_VIDEO_FROM_GALLERY -> {
// trimRequest(data.getUser());
TAKE_VIDEO -> {
if (file != null) media =
Media.create(Thumb.generate(mContext, MediaType.VIDEO, file!!))
}
CHOOSE_VIDEO_FROM_GALLERY -> {
// trimRequest(data.getUser());
// file = FileUtil.getNewPath(context, intent.getData(), MediaType.VIDEO);
file = FileUtil.getFileFromUri(mContext, intent!!.data, MediaType.VIDEO)
if (file == null) return
val mMedia: Media =
Media.create(Thumb.generate(mContext, MediaType.VIDEO, file!!))
if (mMedia.isValid) media = mMedia
}
CROP_REQUEST -> {
if (file == null) return
media = Media.create(Thumb.generate(mContext, MediaType.VIDEO, file!!))
}
PICK_DOCUMENT -> {
try {
if (intent!!.data == null) return
file = FileUtil.getFileFromUri(
mContext,
intent.data,
MediaType.DOCUMENT
)
if (file == null) return
media = Media.create(Thumb.generate(MediaType.DOCUMENT, file!!))
} catch (e: Exception) {
e.printStackTrace()
media = null
file = FileUtil.getFileFromUri(mContext, intent!!.data, MediaType.VIDEO)
if (file == null) return@launch
val mMedia: Media =
Media.create(Thumb.generate(mContext, MediaType.VIDEO, file!!))
if (mMedia.isValid) media = mMedia
}
}
PICK_CONTACT -> {
CROP_REQUEST -> {
if (file == null) return@launch
media = Media.create(Thumb.generate(mContext, MediaType.VIDEO, file!!))
}
PICK_DOCUMENT -> {
try {
if (intent!!.data == null) return@launch
file = FileUtil.getFileFromUri(
mContext,
intent.data,
MediaType.DOCUMENT
)
if (file == null) return@launch
media = Media.create(Thumb.generate(MediaType.DOCUMENT, file!!))
} catch (e: Exception) {
e.printStackTrace()
media = null
}
}
PICK_CONTACT -> {
// if (intent!!.data == null) return
// media = Media.create(Ezvcard.write(readContactFromUri(context, intent.data)).version(VCardVersion.V4_0).go())
}
}
if (mediaPickerCallback == null) return@launch
executeOnMain {
showProgressBar(false)
if (media == null)
mediaPickerCallback!!.onPickedError(null)
else
mediaPickerCallback!!.onPickedSuccess(media)
hideBottomSheet()
}
}
if (mediaPickerCallback == null) return
executeOnMain(Runnable {
showProgressBar(false)
if (media == null)
mediaPickerCallback!!.onPickedError(null)
else
mediaPickerCallback!!.onPickedSuccess(media)
hideBottomSheet()
})
}

fun setMediaListenerCallback(type: Int, mediaPickerCallback: MediaPickerCallback?) {
Expand Down Expand Up @@ -415,11 +412,12 @@ open class BottomSheetFilePicker : BaseBottomSheet(), OnClickListener {
return false
}

fun getFileUri(file: File?): Uri {
fun getFileUri(file: File): Uri {
return Uri.fromFile(file)
}

fun getFileUri(path: String?): Uri {
fun getFileUri(path: String?): Uri? {
if (path == null) return null
return getFileUri(File(path))
}
}
Expand Down

0 comments on commit 9cdc66d

Please sign in to comment.