diff --git a/.gitignore b/.gitignore
index aa724b7..b73a58d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,14 @@
 .externalNativeBuild
 .cxx
 local.properties
+
+# Kotlin incremental compilation cache
+.kotlin/
+
+# Module-level build output (root /build above only covers the top-level dir)
+**/build/
+
+# GPG keyring files — never commit signing keys
+*.gpg
+*.kbx
+secring.gpg
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa5c8e0..288ee57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,31 @@
 # Changelog
 
+## Unreleased
+
+### imagepicker
+- Fluent builder API: `ImagePicker.with(context, caller).source().crop().onResult().onError().launch()`
+- Gallery picking via `ActivityResultContracts.GetContent`
+- Camera capture via `ActivityResultContracts.TakePicture` with automatic EXIF orientation correction
+- `MediaSource.Gallery`, `MediaSource.Camera`, `MediaSource.Both` (Both falls back to Gallery)
+- Sealed `ImagePickerResult`: `Success`, `SuccessWithBitmap`, `Cancelled`, `Error`
+- Sealed `ImagePickerException`: `PermissionDenied`, `AppNotFound`, `FileCreationFailed`, `InvalidUri`, `DecodingFailed`, `FileDeletionFailed`, `IntentFailed`, `Unknown`
+- Automatic CAMERA permission request before camera launch
+- `CropImageLauncher` — chains gallery/camera result into `CropperActivity` when `crop(true)`
+- `ImagePickerFileProvider` — isolated FileProvider subclass; authority `{applicationId}.imagepicker.provider`
+- `<queries>` manifest entry for camera intent visibility on Android 11+
+- All `registerForActivityResult` calls happen at construction time (before `onStart`)
+
+### imagecropper
+- `CropperView` — custom View with matrix-based image fit, touch-drag/resize crop rect
+- `CropOverlayDrawer` — dimmed overlay, border, rule-of-thirds grid, L-shaped corner handles
+- `CropTouchHandler` — detects MOVE / corner / edge areas; enforces `MIN_CROP_SIZE`
+- `CropperSavedState` — full Parcelable save/restore of crop rect across rotation
+- `CropperActivity` — standalone Activity: receives URI via `EXTRA_INPUT_URI`, returns cropped JPEG URI via `EXTRA_OUTPUT_URI` using `FileProvider` (`{applicationId}.imagecropper.provider`)
+- `getCroppedImage()` — returns cropped `Bitmap` from current rect, clamped to image bounds
+
+### sample-app
+- Compose UI: empty state → gallery pick → crop → result display
+- Error and exception feedback via Toast
+
 ## 0.1.0
-- Initial MediaKit OSS setup
-- Added README
-- Prepared repository structure for publishing
+- Initial repository structure and OSS setup
diff --git a/ImageCropper/build.gradle.kts b/ImageCropper/build.gradle.kts
index 1b8e23d..31842db 100644
--- a/ImageCropper/build.gradle.kts
+++ b/ImageCropper/build.gradle.kts
@@ -1,6 +1,8 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
+    `maven-publish`
+    signing
 }
 
 android {
@@ -30,14 +32,82 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 dependencies {
-
+    api(project(":imagepicker"))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
-    implementation(libs.material)
+    implementation(libs.androidx.activity.ktx)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
-}
\ No newline at end of file
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            create<MavenPublication>("release") {
+                from(components["release"])
+                groupId = project.findProperty("GROUP_ID") as String
+                artifactId = "imagecropper"
+                version = project.findProperty("VERSION_NAME") as String
+
+                pom {
+                    name.set("MediaKit ImageCropper")
+                    description.set("Touch-driven image cropping for Android. Custom CropperView with rule-of-thirds grid, corner handles, and state restoration. Integrates with MediaKit ImagePicker or standalone.")
+                    url.set("https://github.com/AkshayAshokCode/MediaKit-android")
+                    licenses {
+                        license {
+                            name.set("MIT License")
+                            url.set("https://opensource.org/licenses/MIT")
+                        }
+                    }
+                    developers {
+                        developer {
+                            id.set("akshayashokcode")
+                            name.set("Akshay Ashok")
+                            email.set("akshayashokan1054@gmail.com")
+                        }
+                    }
+                    scm {
+                        connection.set("scm:git:github.com/AkshayAshokCode/MediaKit-android.git")
+                        developerConnection.set("scm:git:ssh://github.com/AkshayAshokCode/MediaKit-android.git")
+                        url.set("https://github.com/AkshayAshokCode/MediaKit-android/tree/main")
+                    }
+                }
+            }
+        }
+
+        repositories {
+            maven {
+                name = "sonatype"
+                url = uri(
+                    if ((project.findProperty("VERSION_NAME") as String).endsWith("SNAPSHOT"))
+                        "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+                    else
+                        "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+                )
+                credentials {
+                    username = project.findProperty("OSSRH_USERNAME") as String? ?: ""
+                    password = project.findProperty("OSSRH_PASSWORD") as String? ?: ""
+                }
+            }
+        }
+    }
+
+    signing {
+        val signingKeyId = project.findProperty("SIGNING_KEY_ID") as String?
+        val signingKey = project.findProperty("SIGNING_KEY") as String?
+        val signingPassword = project.findProperty("SIGNING_PASSWORD") as String?
+        useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+        sign(publishing.publications["release"])
+    }
+}
diff --git a/ImageCropper/consumer-rules.pro b/ImageCropper/consumer-rules.pro
index e69de29..1c985ae 100644
--- a/ImageCropper/consumer-rules.pro
+++ b/ImageCropper/consumer-rules.pro
@@ -0,0 +1,8 @@
+# Keep CropperActivity — launched by intent from MediaKitCropProvider
+-keep class com.akshayashokcode.imagecropper.CropperActivity { *; }
+
+# Keep MediaKitCropProvider so consumers can instantiate it by name or reflection
+-keep class com.akshayashokcode.imagecropper.MediaKitCropProvider { *; }
+
+# Keep CropperView for consumers embedding it directly in XML layouts
+-keep class com.akshayashokcode.imagecropper.CropperView { *; }
diff --git a/ImageCropper/src/main/AndroidManifest.xml b/ImageCropper/src/main/AndroidManifest.xml
index a5918e6..0f9e7ef 100644
--- a/ImageCropper/src/main/AndroidManifest.xml
+++ b/ImageCropper/src/main/AndroidManifest.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<application>
+    <activity
+        android:name=".CropperActivity"
+        android:exported="false"/>
 
-</manifest>
\ No newline at end of file
+    <provider
+        android:name="androidx.core.content.FileProvider"
+        android:authorities="${applicationId}.imagecropper.provider"
+        android:exported="false"
+        android:grantUriPermissions="true">
+        <meta-data
+            android:name="android.support.FILE_PROVIDER_PATHS"
+            android:resource="@xml/imagecropper_file_paths"/>
+    </provider>
+</application>
+</manifest>
diff --git a/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/CropperActivity.kt b/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/CropperActivity.kt
new file mode 100644
index 0000000..eb3efdf
--- /dev/null
+++ b/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/CropperActivity.kt
@@ -0,0 +1,80 @@
+package com.akshayashokcode.imagecropper
+
+import android.content.Intent
+import android.graphics.BitmapFactory
+import android.os.Bundle
+import android.widget.Button
+import androidx.activity.ComponentActivity
+import androidx.core.content.FileProvider
+import androidx.core.net.toUri
+import java.io.File
+import java.io.FileOutputStream
+
+class CropperActivity : ComponentActivity() {
+
+    companion object {
+        const val EXTRA_INPUT_URI = "extra_input_uri"
+        const val EXTRA_OUTPUT_URI = "extra_output_uri"
+    }
+
+    private lateinit var cropperView: CropperView
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.activity_cropper)
+
+        cropperView = findViewById(R.id.cropperView)
+
+        val cropButton = findViewById<Button>(R.id.buttonCrop)
+
+        val uriString = intent.getStringExtra(EXTRA_INPUT_URI)
+
+        if (uriString == null) {
+            finish()
+            return
+        }
+
+        val inputUri = uriString.toUri()
+
+        val bitmap = contentResolver.openInputStream(inputUri)?.use { BitmapFactory.decodeStream(it) }
+        if (bitmap == null) {
+            setResult(RESULT_CANCELED)
+            finish()
+            return
+        }
+        cropperView.setImageBitmap(bitmap)
+
+        cropButton.setOnClickListener {
+            val croppedBitmap = cropperView.getCroppedImage()
+
+            if (croppedBitmap == null) {
+                setResult(RESULT_CANCELED)
+                finish()
+                return@setOnClickListener
+            }
+
+            val outputFile = File(cacheDir, "cropped_${System.currentTimeMillis()}.jpg")
+
+            FileOutputStream(outputFile).use { outputStream ->
+                croppedBitmap.compress(android.graphics.Bitmap.CompressFormat.JPEG, 100, outputStream)
+            }
+
+            val outputUri = FileProvider.getUriForFile(
+                this,
+                "${packageName}.imagecropper.provider",
+                outputFile
+            )
+
+            setResult(
+                RESULT_OK,
+                Intent().apply {
+                    addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    putExtra(EXTRA_OUTPUT_URI, outputUri.toString())
+                }
+            )
+
+            finish()
+        }
+    }
+}
diff --git a/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/internal/CropOverlayDrawer.kt b/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/internal/CropOverlayDrawer.kt
index c144d00..b54945c 100644
--- a/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/internal/CropOverlayDrawer.kt
+++ b/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/internal/CropOverlayDrawer.kt
@@ -2,7 +2,7 @@ package com.akshayashokcode.imagecropper.internal
 
 import android.graphics.*
 
-class CropOverlayDrawer {
+internal class CropOverlayDrawer {
 
     val bitmapPaint = Paint(Paint.ANTI_ALIAS_FLAG)
 
diff --git a/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/internal/CropTouchHandler.kt b/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/internal/CropTouchHandler.kt
index 12a3336..cd11fc9 100644
--- a/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/internal/CropTouchHandler.kt
+++ b/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/internal/CropTouchHandler.kt
@@ -3,7 +3,7 @@ package com.akshayashokcode.imagecropper.internal
 import android.graphics.RectF
 import kotlin.math.abs
 
-class CropTouchHandler(private val cropRect: RectF) {
+internal class CropTouchHandler(private val cropRect: RectF) {
 
     enum class Area { NONE, MOVE, TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT }
 
diff --git a/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/internal/CropperConstants.kt b/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/internal/CropperConstants.kt
index 5a3f7b7..8330e1f 100644
--- a/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/internal/CropperConstants.kt
+++ b/ImageCropper/src/main/java/com/akshayashokcode/imagecropper/internal/CropperConstants.kt
@@ -2,7 +2,7 @@ package com.akshayashokcode.imagecropper.internal
 
 import androidx.core.graphics.toColorInt
 
-object CropConstants {
+internal object CropConstants {
     const val TOUCH_THRESHOLD = 40f
     const val MIN_CROP_SIZE = 200f
     const val CORNER_STROKE_WIDTH = 10f
diff --git a/ImageCropper/src/main/res/layout/activity_cropper.xml b/ImageCropper/src/main/res/layout/activity_cropper.xml
new file mode 100644
index 0000000..b0e0f02
--- /dev/null
+++ b/ImageCropper/src/main/res/layout/activity_cropper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.akshayashokcode.imagecropper.CropperView
+        android:id="@+id/cropperView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        android:id="@+id/buttonCrop"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Crop"/>
+</LinearLayout>
diff --git a/README.md b/README.md
index b6f7b19..9b9bd4b 100644
--- a/README.md
+++ b/README.md
@@ -1,52 +1,169 @@
 # MediaKit Android
 
-Modern Android media toolkit built with Kotlin.
+A modular Android media SDK built with Kotlin. Pick images from the gallery or camera, then crop them — all with a single fluent API.
 
-## Current Modules
+## Modules
 
-### imagepicker
-- Gallery image picking
-- Camera image capture
-- Lifecycle-aware handling
-- Error callbacks
-- Crop integration support
+| Artifact | Description |
+|----------|-------------|
+| `com.akshayashokcode:imagepicker` | Gallery & camera image picking with lifecycle-safe activity result handling |
+| `com.akshayashokcode:imagecropper` | Custom crop view with touch-driven resize, rule-of-thirds grid, and state restoration |
 
-### imagecropper
-- Matrix-based crop engine
-- Custom crop overlay
-- Crop rectangle controls
-- State restoration support
-- Bitmap export support
+---
 
-## Project Structure
+## Installation
 
-```text
-MediaKit-android/
-├── imagecropper/ (mapped from existing ImageCropper directory)
-├── imagepicker/
-├── sample-app/
-├── docs/
-├── CHANGELOG.md
-├── CONTRIBUTING.md
-└── LICENSE
+Add to your app's `build.gradle.kts`:
+
+```kotlin
+dependencies {
+    // Image picking (gallery + camera)
+    implementation("com.akshayashokcode:imagepicker:1.0.0")
+
+    // Optional — add only if you need the built-in crop UI
+    implementation("com.akshayashokcode:imagecropper:1.0.0")
+}
 ```
 
-## Goals
+`imagecropper` depends on `imagepicker` transitively, so adding just `imagecropper` is enough if you want both.
+
+---
+
+## Quick Start
+
+### Pick from gallery (no crop)
+
+```kotlin
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // Must be constructed before setContent — registerForActivityResult
+        // must be called before the activity reaches STARTED.
+        val picker = ImagePicker.with(this, this)
+            .source(MediaSource.Gallery)
+            .onResult { result ->
+                when (result) {
+                    is ImagePickerResult.Success -> { /* use result.uri */ }
+                    is ImagePickerResult.Cancelled -> { /* user cancelled */ }
+                    is ImagePickerResult.Error -> { /* show result.message */ }
+                    else -> Unit
+                }
+            }
+            .onError { error ->
+                // ImagePickerException: PermissionDenied, AppNotFound, etc.
+            }
+
+        setContent {
+            MyTheme {
+                MyScreen(onPickImage = { picker.launch() })
+            }
+        }
+    }
+}
+```
+
+### Pick and crop
+
+```kotlin
+val picker = ImagePicker.with(this, this)
+    .source(MediaSource.Gallery)
+    .crop(MediaKitCropProvider())   // requires imagecropper artifact
+    .onResult { result -> /* result.uri is the cropped image */ }
+```
+
+### Camera capture
 
-- Modular Android media SDK ecosystem
-- Lightweight dependencies
-- Kotlin-first APIs
-- Modern Android architecture
-- Compose-friendly future support
+```kotlin
+val picker = ImagePicker.with(this, this)
+    .source(MediaSource.Camera)     // requests CAMERA permission automatically
+    .onResult { result ->
+        when (result) {
+            is ImagePickerResult.SuccessWithBitmap -> { /* orientation-corrected bitmap + uri */ }
+            else -> Unit
+        }
+    }
+```
 
-## Vision
+### Embed `CropperView` standalone (optional)
+
+Use the crop UI directly in your own layout without the picker flow:
+
+```xml
+<com.akshayashokcode.imagecropper.CropperView
+    android:id="@+id/cropperView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
+```
+
+```kotlin
+cropperView.setImageBitmap(bitmap)
+val cropped: Bitmap? = cropperView.getCroppedImage()
+```
 
-MediaKit aims to become a reusable Android media ecosystem where developers can integrate only the media components they need.
+---
+
+## Media Sources
+
+```kotlin
+MediaSource.Gallery  // system photo picker / file picker
+MediaSource.Camera   // camera capture (requests CAMERA permission automatically)
+MediaSource.Both     // falls back to gallery (chooser UI planned)
+```
+
+## Result Types
+
+```kotlin
+sealed class ImagePickerResult {
+    data class Success(val uri: Uri)                               // gallery pick or crop output
+    data class SuccessWithBitmap(val uri: Uri, val bitmap: Bitmap) // camera capture (orientation-corrected)
+    data object Cancelled                                          // user dismissed
+    data class Error(val message: String)                          // non-fatal error
+}
+```
+
+## Exception Types
+
+```kotlin
+sealed class ImagePickerException {
+    object PermissionDenied     // CAMERA permission not granted
+    object AppNotFound          // no camera or gallery app available
+    object FileCreationFailed   // temp file for camera capture could not be created
+    object InvalidUri           // returned URI was null or unreadable
+    object DecodingFailed       // bitmap decode / EXIF rotation failed
+    object FileDeletionFailed   // cleanup of temp file failed
+    object IntentFailed         // intent could not be launched
+    class  Unknown(message: String?, cause: Throwable?)
+}
+```
+
+---
+
+## Requirements
+
+- minSdk 24 (Android 7.0)
+- Kotlin
+
+---
+
+## Project Structure
+
+```
+MediaKit-android/
+├── imagecropper/      (library — CropperView, CropperActivity, MediaKitCropProvider)
+├── imagepicker/       (library — ImagePicker, ImageCropProvider interface)
+├── sample-app/        (demo Compose app)
+└── docs/
+```
+
+## Goals
 
-## Publishing
+- Modular — import only what you need; `imagepicker` works without `imagecropper` on the classpath
+- Lightweight — no third-party image loading dependencies
+- Lifecycle-safe — all `registerForActivityResult` calls happen before `onStart`
+- Kotlin-first — sealed results, fluent builder, no Java boilerplate
+- Extensible — implement `ImageCropProvider` to plug in any crop library
 
-Initial target:
-- JitPack
+## License
 
-Future target:
-- Maven Central
+MIT
diff --git a/docs/KNOWN_IMPROVEMENTS.md b/docs/KNOWN_IMPROVEMENTS.md
index bd8d97f..0357245 100644
--- a/docs/KNOWN_IMPROVEMENTS.md
+++ b/docs/KNOWN_IMPROVEMENTS.md
@@ -1,30 +1,40 @@
 # Known Improvements
 
-## Current Priorities
+## In Progress / Planned
 
-### API Cleanup
-- Simplify public APIs
-- Reduce public surface area
-- Improve developer ergonomics
+### MediaSource.Both
+`MediaSource.Both` currently falls back to gallery. A bottom sheet chooser
+(gallery vs camera) is the intended implementation.
 
-### Bitmap Safety
-- Safer bitmap decoding
-- Better memory handling
-- OOM prevention improvements
+### Compose-native API
+The current API requires construction in `Activity.onCreate()` before
+`setContent` due to the `registerForActivityResult` lifecycle constraint.
+A future Compose-friendly surface (e.g. `rememberImagePicker()`) using
+`ActivityResultRegistry` directly would remove this requirement.
 
-### Sample App
-- Better SDK showcase
-- Dedicated demo screens
-- Better navigation
+### Camera temp-file cleanup
+`FileUtils.deleteTempFile` is called on cancellation but not on all error
+paths in `CameraImageLauncher`. A systematic cleanup pass is needed.
+
+### Bitmap memory pressure
+`CropperActivity` holds the full decoded bitmap in memory. Large images
+should be downsampled to the screen resolution before display, with the
+original used only for the final crop export.
 
 ### Publishing
-- JitPack automation
-- Maven Central preparation
-- Semantic versioning
+- JitPack: define a release tag and verify AAR consumption end-to-end
+- Maven Central: complete `MAVEN_CENTRAL_SETUP.md` steps and automate
+  signing via CI
+
+## Resolved (no longer outstanding)
+- ~~API Cleanup~~ — public surface reduced; builder API is stable
+- ~~Bitmap Safety~~ — EXIF orientation fixed; stream leaks closed
+- ~~Sample App~~ — redesigned with gallery → crop → result flow
+- ~~Lifecycle handling~~ — all launchers registered before `onStart`
+- ~~FileProvider conflicts~~ — isolated subclasses per module
 
 ## Future Areas
 
-- Compose support
-- Media compression
-- Camera integrations
-- Media filters
+- Media compression (resize before upload)
+- Video picking support
+- Media filters / adjustments
diff --git a/gradle.properties b/gradle.properties
index 20e2a01..1848a1e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,16 @@
+VERSION_NAME=1.0.0
+GROUP_ID=com.akshayashokcode
+
+# Maven Central / OSSRH publishing credentials
+# Set these in your local ~/.gradle/gradle.properties — never commit real values here
+OSSRH_USERNAME=
+OSSRH_PASSWORD=
+
+# GPG signing — use in-memory PGP key (base64-encoded private key block)
+SIGNING_KEY_ID=
+SIGNING_KEY=
+SIGNING_PASSWORD=
+
 # Project-wide Gradle settings.
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 94758f2..6b3a6a0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,6 +9,7 @@ appcompat = "1.7.0"
 material = "1.12.0"
 lifecycleRuntimeKtx = "2.9.0"
 activityCompose = "1.10.1"
+activityKtx = "1.10.1"
 composeBom = "2024.09.00"
 exifinterface = "1.3.6"
 
@@ -30,6 +31,7 @@ androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-man
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterface", version.ref = "exifinterface" }
+androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activityKtx" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/imagepicker/build.gradle.kts b/imagepicker/build.gradle.kts
index aa0f9c8..f0a8bad 100644
--- a/imagepicker/build.gradle.kts
+++ b/imagepicker/build.gradle.kts
@@ -1,6 +1,8 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
+    `maven-publish`
+    signing
 }
 
 android {
@@ -30,15 +32,81 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 dependencies {
-
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
-    implementation(libs.material)
     implementation(libs.androidx.exifinterface)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
-}
\ No newline at end of file
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            create<MavenPublication>("release") {
+                from(components["release"])
+                groupId = project.findProperty("GROUP_ID") as String
+                artifactId = "imagepicker"
+                version = project.findProperty("VERSION_NAME") as String
+
+                pom {
+                    name.set("MediaKit ImagePicker")
+                    description.set("Lifecycle-safe gallery and camera image picker for Android. Fluent builder API built on Activity Result APIs.")
+                    url.set("https://github.com/AkshayAshokCode/MediaKit-android")
+                    licenses {
+                        license {
+                            name.set("MIT License")
+                            url.set("https://opensource.org/licenses/MIT")
+                        }
+                    }
+                    developers {
+                        developer {
+                            id.set("akshayashokcode")
+                            name.set("Akshay Ashok")
+                            email.set("akshayashokan1054@gmail.com")
+                        }
+                    }
+                    scm {
+                        connection.set("scm:git:github.com/AkshayAshokCode/MediaKit-android.git")
+                        developerConnection.set("scm:git:ssh://github.com/AkshayAshokCode/MediaKit-android.git")
+                        url.set("https://github.com/AkshayAshokCode/MediaKit-android/tree/main")
+                    }
+                }
+            }
+        }
+
+        repositories {
+            maven {
+                name = "sonatype"
+                url = uri(
+                    if ((project.findProperty("VERSION_NAME") as String).endsWith("SNAPSHOT"))
+                        "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+                    else
+                        "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+                )
+                credentials {
+                    username = project.findProperty("OSSRH_USERNAME") as String? ?: ""
+                    password = project.findProperty("OSSRH_PASSWORD") as String? ?: ""
+                }
+            }
+        }
+    }
+
+    signing {
+        val signingKeyId = project.findProperty("SIGNING_KEY_ID") as String?
+        val signingKey = project.findProperty("SIGNING_KEY") as String?
+        val signingPassword = project.findProperty("SIGNING_PASSWORD") as String?
+        useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+        sign(publishing.publications["release"])
+    }
+}
diff --git a/imagepicker/consumer-rules.pro b/imagepicker/consumer-rules.pro
index e69de29..694e6af 100644
--- a/imagepicker/consumer-rules.pro
+++ b/imagepicker/consumer-rules.pro
@@ -0,0 +1,6 @@
+# Keep sealed result and exception types used in consumer when-expressions
+-keep class com.akshayashokcode.imagepicker.model.** { *; }
+
+# Keep the crop provider interface so custom implementations survive shrinking
+-keep interface com.akshayashokcode.imagepicker.crop.** { *; }
+-keep class com.akshayashokcode.imagepicker.crop.** { *; }
diff --git a/imagepicker/src/main/AndroidManifest.xml b/imagepicker/src/main/AndroidManifest.xml
index a5918e6..b06404c 100644
--- a/imagepicker/src/main/AndroidManifest.xml
+++ b/imagepicker/src/main/AndroidManifest.xml
@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-</manifest>
\ No newline at end of file
+    <!--
+        Required on Android 11+ (API 30) for queryIntentActivities to see
+        which apps can handle the camera capture intent.
+    -->
+    <queries>
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+    </queries>
+
+    <application>
+        <provider
+            android:name=".ImagePickerFileProvider"
+            android:authorities="${applicationId}.imagepicker.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/imagepicker_file_paths" />
+        </provider>
+    </application>
+
+</manifest>
diff --git a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/builder/ImagePickerBuilder.kt b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/builder/ImagePickerBuilder.kt
index 128dedf..dba53d2 100644
--- a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/builder/ImagePickerBuilder.kt
+++ b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/builder/ImagePickerBuilder.kt
@@ -3,6 +3,8 @@ package com.akshayashokcode.imagepicker.builder
 import android.content.Context
 import androidx.activity.result.ActivityResultCaller
 import com.akshayashokcode.imagepicker.coordinator.ImagePickerCoordinator
+import com.akshayashokcode.imagepicker.crop.CropLauncher
+import com.akshayashokcode.imagepicker.crop.ImageCropProvider
 import com.akshayashokcode.imagepicker.model.ImagePickerException
 import com.akshayashokcode.imagepicker.model.ImagePickerResult
 import com.akshayashokcode.imagepicker.model.MediaSource
@@ -12,19 +14,35 @@ import com.akshayashokcode.imagepicker.model.MediaSource
  *
  * Consumers should create instances through [with] to keep the public API
  * consistent and future-proof.
+ *
+ * **Lifecycle requirement:** construct the builder (i.e. call [with] and the
+ * full fluent chain including [crop]) in `Activity.onCreate` *before*
+ * `setContent`, so that all `registerForActivityResult` calls happen before
+ * the activity reaches STARTED.
  */
 class ImagePickerBuilder private constructor(
     private val context: Context,
     private val caller: ActivityResultCaller
 ) {
     private var source: MediaSource = MediaSource.Gallery
-
-    // Reserved for future cropper module integration.
-    private var crop: Boolean = false
+    private var cropLauncher: CropLauncher? = null
 
     private var onResult: ((ImagePickerResult) -> Unit)? = null
     private var onError: ((ImagePickerException) -> Unit)? = null
 
+    // Coordinator is created eagerly so gallery/camera registerForActivityResult
+    // calls happen before onStart(). Lambda indirection lets source/callbacks
+    // remain configurable via the fluent setters after construction.
+    // cropLauncher is managed separately — it is registered when crop() is called.
+    private val coordinator = ImagePickerCoordinator(
+        context = context,
+        caller = caller,
+        getSource = { source },
+        getCropLauncher = { cropLauncher },
+        onResult = { result -> onResult?.invoke(result) },
+        onError = { error -> onError?.invoke(error) }
+    )
+
     companion object {
         /**
          * Entry point to start building an image picker flow.
@@ -35,55 +53,48 @@ class ImagePickerBuilder private constructor(
         fun with(
             context: Context,
             caller: ActivityResultCaller
-        ): ImagePickerBuilder {
-            return ImagePickerBuilder(context, caller)
-        }
+        ): ImagePickerBuilder = ImagePickerBuilder(context, caller)
     }
 
-    /**
-     * Configure the media source.
-     */
+    /** Configure the media source. */
     fun source(source: MediaSource): ImagePickerBuilder = apply {
         this.source = source
     }
 
     /**
-     * Enables optional cropping support.
+     * Enables cropping after image selection.
+     *
+     * [provider] is responsible for registering the activity result launcher and
+     * opening its crop UI. Pass [com.akshayashokcode.imagecropper.MediaKitCropProvider]
+     * to use the built-in imagecropper module, or supply your own implementation.
      *
-     * Cropper integration is planned for a future MediaKit release.
+     * This call immediately invokes [ImageCropProvider.createLauncher], which
+     * calls [ActivityResultCaller.registerForActivityResult] — so [crop] must
+     * be called before the activity reaches STARTED (i.e. before `setContent`).
      */
-    fun crop(enable: Boolean): ImagePickerBuilder = apply {
-        this.crop = enable
+    fun crop(provider: ImageCropProvider): ImagePickerBuilder = apply {
+        cropLauncher = provider.createLauncher(
+            context = context,
+            caller = caller,
+            callback = { result -> onResult?.invoke(result) }
+        )
     }
 
-    /**
-     * Callback invoked with picker results.
-     */
+    /** Callback invoked with picker results. */
     fun onResult(callback: (ImagePickerResult) -> Unit): ImagePickerBuilder = apply {
         this.onResult = callback
     }
 
-    /**
-     * Optional callback invoked for picker failures.
-     */
+    /** Optional callback invoked for picker failures. */
     fun onError(callback: (ImagePickerException) -> Unit): ImagePickerBuilder = apply {
         this.onError = callback
     }
 
-    /**
-     * Launches the picker flow with the current configuration.
-     */
+    /** Launches the picker flow with the current configuration. */
     fun launch() {
         requireNotNull(onResult) {
             "You must provide a result callback using onResult()"
         }
-
-        ImagePickerCoordinator(
-            context = context,
-            caller = caller,
-            source = source,
-            onResult = onResult!!,
-            onError = onError
-        ).launch()
+        coordinator.launch()
     }
 }
diff --git a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/coordinator/ImagePickerCoordinator.kt b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/coordinator/ImagePickerCoordinator.kt
index 8be35d8..d7557cf 100644
--- a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/coordinator/ImagePickerCoordinator.kt
+++ b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/coordinator/ImagePickerCoordinator.kt
@@ -2,6 +2,7 @@ package com.akshayashokcode.imagepicker.coordinator
 
 import android.content.Context
 import androidx.activity.result.ActivityResultCaller
+import com.akshayashokcode.imagepicker.crop.CropLauncher
 import com.akshayashokcode.imagepicker.model.ImagePickerException
 import com.akshayashokcode.imagepicker.model.ImagePickerResult
 import com.akshayashokcode.imagepicker.model.MediaSource
@@ -11,43 +12,41 @@ import com.akshayashokcode.imagepicker.picker.GalleryImagePicker
 /**
  * Coordinates the image picker flow and delegates execution to the appropriate
  * picker implementation.
+ *
+ * Both pickers are constructed eagerly so registerForActivityResult is called
+ * before onStart(), as Android requires.
  */
 internal class ImagePickerCoordinator(
-    private val context: Context,
-    private val caller: ActivityResultCaller,
-    private val source: MediaSource,
-    private val onResult: (ImagePickerResult) -> Unit,
-    private val onError: ((ImagePickerException) -> Unit)? = null
+    context: Context,
+    caller: ActivityResultCaller,
+    private val getSource: () -> MediaSource,
+    getCropLauncher: () -> CropLauncher?,
+    onResult: (ImagePickerResult) -> Unit,
+    onError: ((ImagePickerException) -> Unit)? = null
 ) {
 
-    private val galleryPicker by lazy {
-        GalleryImagePicker(
-            context = context,
-            caller = caller,
-            callback = onResult,
-            onError = onError
-        )
-    }
+    private val galleryPicker = GalleryImagePicker(
+        context = context,
+        caller = caller,
+        getCropLauncher = getCropLauncher,
+        callback = onResult,
+        onError = onError
+    )
 
-    private val cameraPicker by lazy {
-        CameraImagePicker(
-            context = context,
-            caller = caller,
-            callback = onResult,
-            onError = onError
-        )
-    }
+    private val cameraPicker = CameraImagePicker(
+        context = context,
+        caller = caller,
+        getCropLauncher = getCropLauncher,
+        callback = onResult,
+        onError = onError
+    )
 
-    /**
-     * Starts the configured picker flow.
-     */
     fun launch() {
-        when (source) {
+        when (getSource()) {
             is MediaSource.Gallery -> galleryPicker.launch()
             is MediaSource.Camera -> cameraPicker.launch()
             is MediaSource.Both -> {
-                // Future enhancement:
-                // Provide a source chooser bottom sheet/dialog.
+                // Future: show a source chooser bottom sheet.
                 galleryPicker.launch()
             }
         }
diff --git a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/CameraImageLauncher.kt b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/CameraImageLauncher.kt
index 2631608..6c83098 100644
--- a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/CameraImageLauncher.kt
+++ b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/CameraImageLauncher.kt
@@ -12,7 +12,7 @@ import com.akshayashokcode.imagepicker.util.AppAvailabilityUtils
 import com.akshayashokcode.imagepicker.util.FileUtils
 import com.akshayashokcode.imagepicker.util.ImageOrientationUtils
 
-class CameraImageLauncher(
+internal class CameraImageLauncher(
     private val context: Context,
     caller: ActivityResultCaller,
     private val callback: (ImagePickerResult) -> Unit,
@@ -40,18 +40,14 @@ class CameraImageLauncher(
 
     private val launcher =
         caller.registerForActivityResult(ActivityResultContracts.TakePicture()) { success ->
-            if (success && tempImageUri != null) {
+            val uri = tempImageUri
+            if (success && uri != null) {
                 try {
                     val rotatedBitmap = ImageOrientationUtils
-                        .getOrientedBitmap(context.contentResolver, tempImageUri!!)
+                        .getOrientedBitmap(context.contentResolver, uri)
 
                     if (rotatedBitmap != null) {
-                        callback(
-                            ImagePickerResult.SuccessWithBitmap(
-                                uri = tempImageUri!!,
-                                bitmap = rotatedBitmap
-                            )
-                        )
+                        callback(ImagePickerResult.SuccessWithBitmap(uri = uri, bitmap = rotatedBitmap))
                     } else {
                         onError?.invoke(ImagePickerException.DecodingFailed)
                         callback(ImagePickerResult.Error("Failed to decode or rotate image"))
@@ -81,15 +77,16 @@ class CameraImageLauncher(
     }
 
     private fun launchCamera() {
-        tempImageUri = FileUtils.createTempImageUri(context)
-        if (tempImageUri == null) {
+        val imageUri = FileUtils.createTempImageUri(context)
+        if (imageUri == null) {
             onError?.invoke(ImagePickerException.FileCreationFailed)
             callback(ImagePickerResult.Error("Unable to create temporary file for captured image"))
             return
         }
+        tempImageUri = imageUri
 
         try {
-            launcher.launch(tempImageUri)
+            launcher.launch(imageUri)
         } catch (e: Exception) {
             onError?.invoke(ImagePickerException.IntentFailed)
             callback(ImagePickerResult.Error("No camera found to handle image capture"))
@@ -111,4 +108,4 @@ class CameraImageLauncher(
     companion object {
         private const val KEY_TEMP_URI = "camera_temp_uri"
     }
-}
\ No newline at end of file
+}
diff --git a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/CropImageLauncher.kt b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/CropImageLauncher.kt
new file mode 100644
index 0000000..1cd45eb
--- /dev/null
+++ b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/CropImageLauncher.kt
@@ -0,0 +1,5 @@
+package com.akshayashokcode.imagepicker.launcher
+
+// This class is no longer used. Crop integration is handled via the ImageCropProvider
+// interface in com.akshayashokcode.imagepicker.crop. See MediaKitCropProvider in
+// the imagecropper module for the built-in implementation.
diff --git a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/GalleryImageLauncher.kt b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/GalleryImageLauncher.kt
index 8e0cb06..a9eeed4 100644
--- a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/GalleryImageLauncher.kt
+++ b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/GalleryImageLauncher.kt
@@ -1,16 +1,13 @@
 package com.akshayashokcode.imagepicker.launcher
 
 import android.content.ActivityNotFoundException
-import android.content.Context
 import android.net.Uri
 import androidx.activity.result.ActivityResultCaller
 import androidx.activity.result.contract.ActivityResultContracts
 import com.akshayashokcode.imagepicker.model.ImagePickerException
 import com.akshayashokcode.imagepicker.model.ImagePickerResult
-import com.akshayashokcode.imagepicker.util.AppAvailabilityUtils
 
-class GalleryImageLauncher(
-    private val context: Context,
+internal class GalleryImageLauncher(
     caller: ActivityResultCaller,
     private val callback: (ImagePickerResult) -> Unit,
     private val onError: ((ImagePickerException) -> Unit)? = null
@@ -26,20 +23,14 @@ class GalleryImageLauncher(
         }
 
     fun launch() {
-        if (!AppAvailabilityUtils.isGalleryAvailable(context)) {
-            onError?.invoke(ImagePickerException.AppNotFound)
-            callback(ImagePickerResult.Error("No gallery app found to select image"))
-            return
-        }
-
         try {
             launcher.launch("image/*")
         } catch (e: ActivityNotFoundException) {
-            onError?.invoke(ImagePickerException.IntentFailed)
-            callback(ImagePickerResult.Error("No gallery found to handle image picking"))
+            onError?.invoke(ImagePickerException.AppNotFound)
+            callback(ImagePickerResult.Error("No app found to handle image selection"))
         } catch (e: Exception) {
             onError?.invoke(ImagePickerException.Unknown("Unexpected error: ${e.message}"))
-            callback(ImagePickerResult.Error("Unexpected error occurred during image selection"))
+            callback(ImagePickerResult.Error("Unexpected error during image selection"))
         }
     }
 }
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/PermissionLauncher.kt b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/PermissionLauncher.kt
index 9dc6884..59e8fb5 100644
--- a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/PermissionLauncher.kt
+++ b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/launcher/PermissionLauncher.kt
@@ -6,7 +6,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import com.akshayashokcode.imagepicker.model.ImagePickerException
 import com.akshayashokcode.imagepicker.util.PermissionUtils
 
-class PermissionLauncher(
+internal class PermissionLauncher(
     private val context: Context,
     caller: ActivityResultCaller,
     private val onResult: (granted: Boolean) -> Unit,
@@ -20,8 +20,7 @@ class PermissionLauncher(
             val granted = permissions.all { it.value }
             onResult(granted)
         } catch (e: Exception) {
-            onError?.invoke(
-                ImagePickerException.PermissionDenied)
+            onError?.invoke(ImagePickerException.PermissionDenied)
             onResult(false)
         }
     }
@@ -31,8 +30,7 @@ class PermissionLauncher(
             val permissions = PermissionUtils.getRequiredCameraPermissions()
             permissionLauncher.launch(permissions)
         } catch (e: Exception) {
-            onError?.invoke(
-                ImagePickerException.PermissionDenied)
+            onError?.invoke(ImagePickerException.PermissionDenied)
             onResult(false)
         }
     }
diff --git a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/picker/CameraImagePicker.kt b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/picker/CameraImagePicker.kt
index 2bd4773..c676878 100644
--- a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/picker/CameraImagePicker.kt
+++ b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/picker/CameraImagePicker.kt
@@ -1,31 +1,44 @@
 package com.akshayashokcode.imagepicker.picker
 
 import android.content.Context
+import android.net.Uri
 import androidx.activity.result.ActivityResultCaller
+import com.akshayashokcode.imagepicker.crop.CropLauncher
 import com.akshayashokcode.imagepicker.launcher.CameraImageLauncher
 import com.akshayashokcode.imagepicker.model.ImagePickerException
 import com.akshayashokcode.imagepicker.model.ImagePickerResult
 
-/**
- * Camera-backed picker implementation.
- */
 internal class CameraImagePicker(
-    private val context: Context,
-    private val caller: ActivityResultCaller,
+    context: Context,
+    caller: ActivityResultCaller,
+    private val getCropLauncher: () -> CropLauncher?,
     private val callback: (ImagePickerResult) -> Unit,
     private val onError: ((ImagePickerException) -> Unit)? = null
 ) {
 
-    private val launcher by lazy {
-        CameraImageLauncher(
-            context = context,
-            caller = caller,
-            callback = callback,
-            onError = onError
-        )
-    }
+    private val launcher = CameraImageLauncher(
+        context = context,
+        caller = caller,
+        callback = { result ->
+            when (result) {
+                is ImagePickerResult.Success -> handleCropIfNeeded(result.uri)
+                is ImagePickerResult.SuccessWithBitmap -> handleCropIfNeeded(result.uri)
+                else -> callback(result)
+            }
+        },
+        onError = onError
+    )
 
     fun launch() {
         launcher.launch()
     }
+
+    private fun handleCropIfNeeded(uri: Uri) {
+        val cropLauncher = getCropLauncher()
+        if (cropLauncher != null) {
+            cropLauncher.launch(uri)
+        } else {
+            callback(ImagePickerResult.Success(uri))
+        }
+    }
 }
diff --git a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/picker/GalleryImagePicker.kt b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/picker/GalleryImagePicker.kt
index ac8d1f1..fd517be 100644
--- a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/picker/GalleryImagePicker.kt
+++ b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/picker/GalleryImagePicker.kt
@@ -1,31 +1,42 @@
 package com.akshayashokcode.imagepicker.picker
 
 import android.content.Context
+import android.net.Uri
 import androidx.activity.result.ActivityResultCaller
+import com.akshayashokcode.imagepicker.crop.CropLauncher
 import com.akshayashokcode.imagepicker.launcher.GalleryImageLauncher
 import com.akshayashokcode.imagepicker.model.ImagePickerException
 import com.akshayashokcode.imagepicker.model.ImagePickerResult
 
-/**
- * Gallery-backed picker implementation.
- */
 internal class GalleryImagePicker(
-    private val context: Context,
-    private val caller: ActivityResultCaller,
+    context: Context,
+    caller: ActivityResultCaller,
+    private val getCropLauncher: () -> CropLauncher?,
     private val callback: (ImagePickerResult) -> Unit,
     private val onError: ((ImagePickerException) -> Unit)? = null
 ) {
 
-    private val launcher by lazy {
-        GalleryImageLauncher(
-            context = context,
-            caller = caller,
-            callback = callback,
-            onError = onError
-        )
-    }
+    private val launcher = GalleryImageLauncher(
+        caller = caller,
+        callback = { result ->
+            when (result) {
+                is ImagePickerResult.Success -> handleCropIfNeeded(result.uri)
+                else -> callback(result)
+            }
+        },
+        onError = onError
+    )
 
     fun launch() {
         launcher.launch()
     }
+
+    private fun handleCropIfNeeded(uri: Uri) {
+        val cropLauncher = getCropLauncher()
+        if (cropLauncher != null) {
+            cropLauncher.launch(uri)
+        } else {
+            callback(ImagePickerResult.Success(uri))
+        }
+    }
 }
diff --git a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/AppAvailabilityUtils.kt b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/AppAvailabilityUtils.kt
index e31ac9d..b6efecc 100644
--- a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/AppAvailabilityUtils.kt
+++ b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/AppAvailabilityUtils.kt
@@ -5,7 +5,7 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.provider.MediaStore
 
-object AppAvailabilityUtils {
+internal object AppAvailabilityUtils {
     fun isGalleryAvailable(context: Context): Boolean {
         val intent = Intent(Intent.ACTION_PICK).apply {
             type = "image/*"
diff --git a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/FileUtils.kt b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/FileUtils.kt
index a664d48..0ba1385 100644
--- a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/FileUtils.kt
+++ b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/FileUtils.kt
@@ -5,14 +5,14 @@ import android.net.Uri
 import androidx.core.content.FileProvider
 import java.io.File
 
-object FileUtils {
+internal object FileUtils {
     fun createTempImageUri(context: Context): Uri? {
         return try {
             val file = File.createTempFile("camera_image_", ".jpg", context.cacheDir).apply {
                 createNewFile()
                 deleteOnExit()
             }
-            FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
+            FileProvider.getUriForFile(context, "${context.packageName}.imagepicker.provider", file)
         } catch (e: Exception) {
             e.printStackTrace()
             null
diff --git a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/ImageOrientationUtils.kt b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/ImageOrientationUtils.kt
index 0276f85..9131406 100644
--- a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/ImageOrientationUtils.kt
+++ b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/ImageOrientationUtils.kt
@@ -11,13 +11,13 @@ import android.util.Log
 import androidx.exifinterface.media.ExifInterface
 import java.io.IOException
 
-object ImageOrientationUtils {
+internal object ImageOrientationUtils {
 
     fun getOrientedBitmap(contentResolver: ContentResolver, imageUri: Uri): Bitmap? {
         return try {
             val originalBitmap = decodeBitmap(contentResolver, imageUri) ?: return null
-            val inputStream = contentResolver.openInputStream(imageUri) ?: return originalBitmap
-            val exif = ExifInterface(inputStream)
+            val exif = contentResolver.openInputStream(imageUri)?.use { ExifInterface(it) }
+                ?: return originalBitmap
             rotateBitmapIfNeeded(originalBitmap, exif)
         } catch (e: IOException) {
             Log.e("ImageOrientationUtils", "Failed to get oriented bitmap", e)
diff --git a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/PermissionUtils.kt b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/PermissionUtils.kt
index b0cc0d5..75f5a3d 100644
--- a/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/PermissionUtils.kt
+++ b/imagepicker/src/main/java/com/akshayashokcode/imagepicker/util/PermissionUtils.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.pm.PackageManager
 import androidx.core.content.ContextCompat
 
-object PermissionUtils {
+internal object PermissionUtils {
     /**
      * Checks if all required camera permissions are granted.
      */
diff --git a/sample-app/src/main/java/com/akshayashokcode/sample_app/MainActivity.kt b/sample-app/src/main/java/com/akshayashokcode/sample_app/MainActivity.kt
index dd3ae54..612f97b 100644
--- a/sample-app/src/main/java/com/akshayashokcode/sample_app/MainActivity.kt
+++ b/sample-app/src/main/java/com/akshayashokcode/sample_app/MainActivity.kt
@@ -1,43 +1,58 @@
 package com.akshayashokcode.sample_app
 
+import android.graphics.BitmapFactory
 import android.os.Bundle
+import android.util.Log
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.runtime.mutableStateOf
+import com.akshayashokcode.imagecropper.MediaKitCropProvider
+import com.akshayashokcode.imagepicker.entrypoint.ImagePicker
+import com.akshayashokcode.imagepicker.model.ImagePickerResult
+import com.akshayashokcode.imagepicker.model.MediaSource
 import com.akshayashokcode.sample_app.ui.CropperScreen
 import com.akshayashokcode.sample_app.ui.theme.AndroidImageCropperTheme
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        // Built before setContent so registerForActivityResult fires before onStart.
+        val pickedBitmap = mutableStateOf<android.graphics.Bitmap?>(null)
+
+        val picker = ImagePicker.with(this, this)
+            .source(MediaSource.Gallery)
+            .crop(MediaKitCropProvider())
+            .onResult { result ->
+                when (result) {
+                    is ImagePickerResult.Success -> {
+                        pickedBitmap.value = contentResolver
+                            .openInputStream(result.uri)
+                            ?.use { BitmapFactory.decodeStream(it) }
+                    }
+                    is ImagePickerResult.Error -> {
+                        Log.e("MediaKit", "Picker error: ${result.message}")
+                        Toast.makeText(this, result.message, Toast.LENGTH_SHORT).show()
+                    }
+                    else -> Unit
+                }
+            }
+            .onError { error ->
+                Log.e("MediaKit", "Picker exception: ${error.message}")
+                Toast.makeText(this, error.message ?: "Something went wrong", Toast.LENGTH_SHORT).show()
+            }
+
         enableEdgeToEdge()
         setContent {
             AndroidImageCropperTheme {
-                CropperScreen()
+                CropperScreen(
+                    onPickImage = { picker.launch() },
+                    pickedBitmap = pickedBitmap.value
+                )
             }
         }
     }
 }
 
-@Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
-    Text(
-        text = "Hello $name!",
-        modifier = modifier
-    )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
-    AndroidImageCropperTheme {
-        Greeting("Android")
-    }
-}
\ No newline at end of file
diff --git a/sample-app/src/main/java/com/akshayashokcode/sample_app/ui/CropperScreen.kt b/sample-app/src/main/java/com/akshayashokcode/sample_app/ui/CropperScreen.kt
index 23be21f..0555ec2 100644
--- a/sample-app/src/main/java/com/akshayashokcode/sample_app/ui/CropperScreen.kt
+++ b/sample-app/src/main/java/com/akshayashokcode/sample_app/ui/CropperScreen.kt
@@ -1,86 +1,190 @@
 package com.akshayashokcode.sample_app.ui
 
 import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.view.LayoutInflater
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.CenterAlignedTopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
-import com.akshayashokcode.imagecropper.CropperView
-import com.akshayashokcode.sample_app.R
+import androidx.compose.ui.unit.sp
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun CropperScreen() {
-    val context = LocalContext.current
-    var croppedBitmap by remember { mutableStateOf<Bitmap?>(null) }
-
-    val cropperViewState = remember { mutableStateOf<CropperView?>(null) }
+fun CropperScreen(
+    onPickImage: () -> Unit,
+    pickedBitmap: Bitmap?
+) {
+    Scaffold(
+        topBar = {
+            CenterAlignedTopAppBar(
+                title = {
+                    Text(
+                        "MediaKit",
+                        fontWeight = FontWeight.SemiBold
+                    )
+                },
+                colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
+                    containerColor = MaterialTheme.colorScheme.surface
+                )
+            )
+        }
+    ) { innerPadding ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(innerPadding)
+                .padding(horizontal = 20.dp, vertical = 12.dp),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Text(
+                text = "Select a photo from your gallery and crop it to your liking",
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                textAlign = TextAlign.Center,
+                modifier = Modifier.padding(bottom = 20.dp)
+            )
 
-    Column(
-        Modifier
-            .fillMaxSize()
-            .padding(vertical = 50.dp)
-    ) {
-        AndroidView(
-            factory = { ctx ->
-                val inflater = LayoutInflater.from(ctx)
-                val view = inflater.inflate(R.layout.cropper_view_layout, null)
-                val cropperView = view.findViewById<CropperView>(R.id.cropperView)
+            // Image preview / empty state
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .weight(1f)
+                    .clip(RoundedCornerShape(20.dp))
+                    .background(MaterialTheme.colorScheme.surfaceVariant),
+                contentAlignment = Alignment.Center
+            ) {
+                if (pickedBitmap != null) {
+                    Image(
+                        bitmap = pickedBitmap.asImageBitmap(),
+                        contentDescription = "Cropped image",
+                        modifier = Modifier.fillMaxSize(),
+                        contentScale = ContentScale.Fit
+                    )
+                } else {
+                    EmptyState()
+                }
+            }
 
-                cropperViewState.value = cropperView
+            Spacer(Modifier.height(20.dp))
 
-                // Load sample image into cropper.
-                val bitmap = BitmapFactory.decodeResource(
-                    ctx.resources,
-                    R.drawable.image
+            if (pickedBitmap != null) {
+                // Primary: pick another; secondary label to clarify the crop step
+                Button(
+                    onClick = onPickImage,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(52.dp),
+                    shape = RoundedCornerShape(14.dp)
+                ) {
+                    Text("Pick Another Photo", style = MaterialTheme.typography.labelLarge)
+                }
+                Spacer(Modifier.height(8.dp))
+                Text(
+                    "Gallery → Crop → Result",
+                    style = MaterialTheme.typography.labelSmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    modifier = Modifier.padding(bottom = 4.dp)
                 )
+            } else {
+                Button(
+                    onClick = onPickImage,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(52.dp),
+                    shape = RoundedCornerShape(14.dp)
+                ) {
+                    Text("Select from Gallery", style = MaterialTheme.typography.labelLarge)
+                }
+                Spacer(Modifier.height(8.dp))
+                Text(
+                    "You'll be able to crop after selecting",
+                    style = MaterialTheme.typography.labelSmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    modifier = Modifier.padding(bottom = 4.dp)
+                )
+            }
+        }
+    }
+}
 
-                cropperView.setImageBitmap(bitmap)
-
-                view
-            },
-            modifier = Modifier
-                .weight(1f)
-                .fillMaxWidth()
-        )
-
-        Button(
-            onClick = {
-                croppedBitmap = cropperViewState.value?.getCroppedImage()
-            },
+@Composable
+private fun EmptyState() {
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center
+    ) {
+        Box(
             modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp)
+                .size(88.dp)
+                .background(
+                    color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.10f),
+                    shape = CircleShape
+                ),
+            contentAlignment = Alignment.Center
         ) {
-            Text("Crop Image")
-        }
-
-        croppedBitmap?.let { bitmap ->
-            Image(
-                bitmap = bitmap.asImageBitmap(),
-                contentDescription = "Cropped",
+            // Simple photo placeholder drawn with nested boxes
+            Box(
                 modifier = Modifier
-                    .padding(16.dp)
-                    .height(200.dp)
-                    .fillMaxWidth(),
-                contentScale = ContentScale.Fit
+                    .size(40.dp)
+                    .background(
+                        color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.25f),
+                        shape = RoundedCornerShape(6.dp)
+                    )
+            )
+            Box(
+                modifier = Modifier
+                    .size(16.dp)
+                    .background(
+                        color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.40f),
+                        shape = CircleShape
+                    )
+                    .align(Alignment.TopCenter)
             )
         }
+
+        Spacer(Modifier.height(20.dp))
+
+        Text(
+            "No image selected",
+            style = MaterialTheme.typography.titleMedium,
+            fontWeight = FontWeight.Medium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+
+        Spacer(Modifier.height(6.dp))
+
+        Text(
+            "Your cropped photo will appear here",
+            style = MaterialTheme.typography.bodySmall,
+            color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.65f),
+            textAlign = TextAlign.Center,
+            modifier = Modifier.padding(horizontal = 32.dp)
+        )
     }
 }