diff --git a/sample/src/main/kotlin/com/canhub/cropper/sample/SampleCustomActivity.kt b/sample/src/main/kotlin/com/canhub/cropper/sample/SampleCustomActivity.kt
index 37ac42d6..d87ef467 100644
--- a/sample/src/main/kotlin/com/canhub/cropper/sample/SampleCustomActivity.kt
+++ b/sample/src/main/kotlin/com/canhub/cropper/sample/SampleCustomActivity.kt
@@ -9,6 +9,7 @@ import android.view.View
 import androidx.core.app.ActivityCompat
 import com.canhub.cropper.CropImage.ActivityResult
 import com.canhub.cropper.CropImageActivity
+import com.canhub.cropper.CropImageView
 import com.example.croppersample.R
 import com.example.croppersample.databinding.ExtendedActivityBinding
 import timber.log.Timber
@@ -26,33 +27,52 @@ internal class SampleCustomActivity : CropImageActivity() {
   }
 
   private lateinit var binding: ExtendedActivityBinding
-  private var counter = 0
 
   override fun onCreate(savedInstanceState: Bundle?) {
     binding = ExtendedActivityBinding.inflate(layoutInflater)
 
     super.onCreate(savedInstanceState)
-    updateRotationCounter(counter.toString())
 
     binding.saveBtn.setOnClickListener { cropImage() }
     binding.backBtn.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
     binding.rotateText.setOnClickListener { onRotateClick() }
 
+    binding.cropImageView.setOnCropWindowChangedListener {
+      updateExpectedImageSize()
+    }
+
     setCropImageView(binding.cropImageView)
   }
 
+  override fun onSetImageUriComplete(
+    view: CropImageView,
+    uri: Uri,
+    error: Exception?,
+  ) {
+    super.onSetImageUriComplete(view, uri, error)
+
+    updateRotationCounter()
+    updateExpectedImageSize()
+  }
+
+  private fun updateExpectedImageSize() {
+    binding.expectedImageSize.text = binding.cropImageView.expectedImageSize().toString()
+  }
+
   override fun setContentView(view: View) {
     super.setContentView(binding.root)
   }
 
-  private fun updateRotationCounter(counter: String) {
-    binding.rotateText.text = getString(R.string.rotation_value, counter)
+  private fun updateRotationCounter() {
+    binding.rotateText.text = getString(R.string.rotation_value, binding.cropImageView.rotatedDegrees.toString())
   }
 
   override fun onPickImageResult(resultUri: Uri?) {
     super.onPickImageResult(resultUri)
 
-    if (resultUri != null) binding.cropImageView.setImageUriAsync(resultUri)
+    if (resultUri != null) {
+      binding.cropImageView.setImageUriAsync(resultUri)
+    }
   }
 
   override fun getResultIntent(uri: Uri?, error: java.lang.Exception?, sampleSize: Int): Intent {
@@ -91,9 +111,7 @@ internal class SampleCustomActivity : CropImageActivity() {
   }
 
   private fun onRotateClick() {
-    counter += 90
     binding.cropImageView.rotateImage(90)
-    if (counter == 360) counter = 0
-    updateRotationCounter(counter.toString())
+    updateRotationCounter()
   }
 }
diff --git a/sample/src/main/res/layout/extended_activity.xml b/sample/src/main/res/layout/extended_activity.xml
index 314bf4a6..bea36c87 100644
--- a/sample/src/main/res/layout/extended_activity.xml
+++ b/sample/src/main/res/layout/extended_activity.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/bg_purple_gradient"
     >
   <ImageView
@@ -10,7 +11,7 @@
       android:id="@+id/backBtn"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:background="?android:attr/selectableItemBackground"
+      android:background="?attr/selectableItemBackgroundBorderless"
       android:padding="@dimen/keyline_x4"
       app:srcCompat="@drawable/ic_arrow_back_24"
       app:layout_constraintStart_toStartOf="parent"
@@ -20,7 +21,7 @@
       android:id="@+id/saveBtn"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:background="?android:attr/selectableItemBackground"
+      android:background="?attr/selectableItemBackgroundBorderless"
       android:padding="@dimen/keyline_x4"
       android:text="@string/save"
       android:textColor="@color/orange"
@@ -33,35 +34,36 @@
       android:id="@+id/canhubLogo"
       android:layout_width="100dp"
       android:layout_height="100dp"
-      app:srcCompat="@drawable/canhub_logo_white"
+      android:src="@drawable/canhub_logo_white"
+      app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/backBtn"
+      app:layout_constraintTop_toTopOf="parent"
       />
   <TextView
-      android:id="@+id/text"
-      android:layout_width="0dp"
+      android:id="@+id/rotateText"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:padding="@dimen/keyline_x4"
       android:gravity="center"
-      android:padding="@dimen/keyline_x2"
-      android:text="@string/extend_body"
+      android:textIsSelectable="false"
+      tools:text="@string/rotation_value"
       android:textColor="@color/white"
       app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toEndOf="@id/canhubLogo"
-      app:layout_constraintTop_toTopOf="@id/canhubLogo"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/canhubLogo"
       />
   <TextView
-      android:id="@+id/rotateText"
+      android:id="@+id/expectedImageSize"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:paddingStart="@dimen/keyline_x4"
-      android:paddingTop="@dimen/keyline_x4"
-      android:paddingEnd="@dimen/keyline_x4"
-      android:paddingBottom="@dimen/keyline_x4"
-      android:text="@string/rotation_value"
+      android:padding="@dimen/keyline_x4"
+      android:gravity="center"
+      tools:text="Crop Rect"
+      android:textIsSelectable="false"
       android:textColor="@color/white"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/text"
+      app:layout_constraintTop_toBottomOf="@id/rotateText"
       />
   <com.canhub.cropper.CropImageView
       android:id="@+id/cropImageView"
@@ -74,6 +76,6 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/rotateText"
+      app:layout_constraintTop_toBottomOf="@id/expectedImageSize"
       />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 0dfa3481..de846d9e 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -44,7 +44,6 @@
   <string name="callLibraryWithoutUriCameraOnly_text">Call library directly without uri. Camera only</string>
   <string name="callLibraryWithoutUriGalleryOnly_text">Call library directly without uri. Gallery only</string>
   <string name="save">Save</string>
-  <string name="extend_body">This is a sample code using the library. The sample here is for extend CropImageActivity, to be about to custom build your personal view around it. For that we need to use CropImageView.</string>
   <string name="rotation_value">Click to change rotation: %1$s</string>
   <string name="crop_corner__shape">Corner Shape</string>
   <string name="show_crop_label_text">Show Crop Label Text</string>