Skip to content

update #76

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

Merged
ChochaNaresh merged 5 commits into from
Sep 11, 2025
Merged

update #76

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
256e2ad
build: update Kotlin, AGP, and target JVM version
nchocha-kairosliving Sep 9, 2025
0069871
feat: add configType to result intents
nchocha-kairosliving Sep 11, 2025
b8c7f21
refactor: vertically center items in PopupItem
nchocha-kairosliving Sep 11, 2025
e38ed33
refactor: pass config type in success results and improve PopUpActivity
nchocha-kairosliving Sep 11, 2025
91526c6
refactor: centralize result parsing in FilePickerResultContracts
nchocha-kairosliving Sep 11, 2025
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
2 changes: 1 addition & 1 deletion filepickerlibrary/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ android {
}
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
jvmTarget.set(JvmTarget.JVM_24)
}
}
}
Expand Down
124 changes: 47 additions & 77 deletions ...ckerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/FilePickerResultContracts.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,28 @@ import com.nareshchocha.filepickerlibrary.ui.activitys.VideoCaptureActivity
import com.nareshchocha.filepickerlibrary.utilities.appConst.Const
import com.nareshchocha.filepickerlibrary.utilities.getClipDataUris

private fun parsePickerResult(
resultCode: Int,
intent: Intent?
): FilePickerResult =
if (intent == null || resultCode != Activity.RESULT_OK) {
FilePickerResult(errorMessage = "File selection failed or cancelled")
} else {
if (intent.clipData != null) {
FilePickerResult(
selectedFileUris = intent.getClipDataUris(),
selectedFilePaths = intent.getStringArrayListExtra(Const.BundleExtras.FILE_PATH_LIST)
)
} else if (intent.data != null) {
FilePickerResult(
selectedFileUri = intent.data,
selectedFilePath = intent.getStringExtra(Const.BundleExtras.FILE_PATH)
)
} else {
FilePickerResult(errorMessage = "No file selected")
}
}

/**
* A collection of ActivityResultContracts for different file picking operations.
* This class provides various contracts for capturing images, videos, selecting media,
Expand Down Expand Up @@ -93,24 +115,7 @@ class FilePickerResultContracts private constructor() {
override fun parseResult(
resultCode: Int,
intent: Intent?
): FilePickerResult =
if (intent == null || resultCode != Activity.RESULT_OK) {
FilePickerResult(errorMessage = "Media selection failed or cancelled")
} else {
if (intent.clipData != null) {
FilePickerResult(
selectedFileUris = intent.getClipDataUris(),
selectedFilePaths = intent.getStringArrayListExtra(Const.BundleExtras.FILE_PATH_LIST)
)
} else if (intent.data != null) {
FilePickerResult(
selectedFileUri = intent.data,
selectedFilePath = intent.getStringExtra(Const.BundleExtras.FILE_PATH)
)
} else {
FilePickerResult(errorMessage = "No file selected")
}
}
): FilePickerResult = parsePickerResult(resultCode, intent)
}

/**
Expand All @@ -126,24 +131,7 @@ class FilePickerResultContracts private constructor() {
override fun parseResult(
resultCode: Int,
intent: Intent?
): FilePickerResult =
if (intent == null || resultCode != Activity.RESULT_OK) {
FilePickerResult(errorMessage = "Document selection failed or cancelled")
} else {
if (intent.clipData != null) {
FilePickerResult(
selectedFileUris = intent.getClipDataUris(),
selectedFilePaths = intent.getStringArrayListExtra(Const.BundleExtras.FILE_PATH_LIST)
)
} else if (intent.data != null) {
FilePickerResult(
selectedFileUri = intent.data,
selectedFilePath = intent.getStringExtra(Const.BundleExtras.FILE_PATH)
)
} else {
FilePickerResult(errorMessage = "No file selected")
}
}
): FilePickerResult = parsePickerResult(resultCode, intent)
}

/**
Expand Down Expand Up @@ -171,24 +159,7 @@ class FilePickerResultContracts private constructor() {
override fun parseResult(
resultCode: Int,
intent: Intent?
): FilePickerResult =
if (intent == null || resultCode != Activity.RESULT_OK) {
FilePickerResult(errorMessage = "File selection failed or cancelled")
} else {
if (intent.clipData != null) {
FilePickerResult(
selectedFileUris = intent.getClipDataUris(),
selectedFilePaths = intent.getStringArrayListExtra(Const.BundleExtras.FILE_PATH_LIST)
)
} else if (intent.data != null) {
FilePickerResult(
selectedFileUri = intent.data,
selectedFilePath = intent.getStringExtra(Const.BundleExtras.FILE_PATH)
)
} else {
FilePickerResult(errorMessage = "No file selected")
}
}
): FilePickerResult = parsePickerResult(resultCode, intent)
}

/**
Expand All @@ -197,41 +168,40 @@ class FilePickerResultContracts private constructor() {
* Returns a FilePickerResult based on the selected file(s).
*/
class AnyFilePicker : ActivityResultContract<BaseConfig?, FilePickerResult>() {
private var baseConfig: BaseConfig? = null

override fun createIntent(
context: Context,
input: BaseConfig?
): Intent {
baseConfig = input ?: ImageCaptureConfig()
return when (input) {
is ImageCaptureConfig -> ImageCapture().createIntent(context, input)
is VideoCaptureConfig -> VideoCapture().createIntent(context, input)
is PickMediaConfig -> PickMedia().createIntent(context, input)
is DocumentFilePickerConfig -> PickDocumentFile().createIntent(context, input)
else -> ImageCapture().createIntent(context, ImageCaptureConfig())
val picker = input ?: ImageCaptureConfig()
return when (picker) {
is ImageCaptureConfig -> ImageCapture().createIntent(context, picker)
is VideoCaptureConfig -> VideoCapture().createIntent(context, picker)
is PickMediaConfig -> PickMedia().createIntent(context, picker)
is DocumentFilePickerConfig -> PickDocumentFile().createIntent(context, picker)
}
}

override fun parseResult(
resultCode: Int,
intent: Intent?
): FilePickerResult =
): FilePickerResult {
if (intent == null || resultCode != Activity.RESULT_OK) {
FilePickerResult(errorMessage = "File selection failed or cancelled")
} else {
when (baseConfig) {
is ImageCaptureConfig -> ImageCapture().parseResult(resultCode, intent)
is VideoCaptureConfig -> VideoCapture().parseResult(resultCode, intent)
is PickMediaConfig -> PickMedia().parseResult(resultCode, intent)
is DocumentFilePickerConfig ->
PickDocumentFile().parseResult(
resultCode,
intent
)
return FilePickerResult(errorMessage = "File selection failed or cancelled")
}

else -> FilePickerResult(errorMessage = "Unknown file type")
}
val configType = intent.getStringExtra(Const.BundleExtras.CONFIG_TYPE)
return when (configType) {
ImageCaptureConfig::class.java.name -> ImageCapture().parseResult(resultCode, intent)
VideoCaptureConfig::class.java.name -> VideoCapture().parseResult(resultCode, intent)
PickMediaConfig::class.java.name -> PickMedia().parseResult(resultCode, intent)
DocumentFilePickerConfig::class.java.name ->
PickDocumentFile().parseResult(
resultCode,
intent
)

else -> FilePickerResult(errorMessage = "Unknown file type")
}
}
}
}
18 changes: 15 additions & 3 deletions ...c/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/DocumentFilePickerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,27 @@ internal class DocumentFilePickerActivity : ComponentActivity() {
if (mDocumentFilePickerConfig?.allowMultiple == true && result.data?.clipData != null) {
val uris = result.data?.getClipDataUris()
val filePaths = uris?.getFilePathList(this)
setSuccessResult(uris, filePath = filePaths)
setSuccessResult(
fileUri = uris,
filePath = filePaths,
configType = DocumentFilePickerConfig::class.java.name
)
} else if (result.data?.data != null) {
val data = result.data?.data
val filePath = data?.let { FileUtils.getRealPath(this, it) }
setSuccessResult(data, filePath)
setSuccessResult(
fileUri = data,
filePath = filePath,
configType = DocumentFilePickerConfig::class.java.name
)
} else if (result.data?.clipData != null) {
val uri = result.data?.getClipDataUris()?.firstOrNull()
val filePath = uri?.let { FileUtils.getRealPath(this, it) }
setSuccessResult(uri, filePath)
setSuccessResult(
fileUri = uri,
filePath = filePath,
configType = DocumentFilePickerConfig::class.java.name
)
} else {
setCanceledResult(getString(R.string.document_file_picker_no_data_error))
}
Expand Down
7 changes: 6 additions & 1 deletion ...ary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/ImageCaptureActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ internal class ImageCaptureActivity : ComponentActivity() {
ActivityResultContracts.StartActivityForResult()
) { result ->
if (result.resultCode == RESULT_OK) {
setSuccessResult(imageFileUri, imageFile?.absolutePath, true)
setSuccessResult(
fileUri = imageFileUri,
filePath = imageFile?.absolutePath,
isFromCapture = true,
configType = ImageCaptureConfig::class.java.name
)
} else {
imageFile?.delete()
setCanceledResult("File Picker Result Error: ${result.resultCode}")
Expand Down
18 changes: 15 additions & 3 deletions .../src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/MediaFilePickerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,27 @@ internal class MediaFilePickerActivity : ComponentActivity() {
if (mPickMediaConfig?.allowMultiple == true && result.data?.clipData != null) {
val uris = result.data?.getClipDataUris()
val filePaths = uris?.getFilePathList(this)
setSuccessResult(uris, filePath = filePaths)
setSuccessResult(
fileUri = uris,
filePath = filePaths,
configType = PickMediaConfig::class.java.name
)
} else if (result.data?.data != null) {
val data = result.data?.data
val filePath = data?.let { FileUtils.getRealPath(this, it) }
setSuccessResult(data, filePath)
setSuccessResult(
fileUri = data,
filePath = filePath,
configType = PickMediaConfig::class.java.name
)
} else if (result.data?.clipData != null) {
val uri = result.data?.getClipDataUris()?.firstOrNull()
val filePath = uri?.let { FileUtils.getRealPath(this, it) }
setSuccessResult(uri, filePath)
setSuccessResult(
fileUri = uri,
filePath = filePath,
configType = PickMediaConfig::class.java.name
)
} else {
setCanceledResult(getString(R.string.media_file_picker_no_data_error))
}
Expand Down
Loading
Loading