diff --git a/README.md b/README.md
index ec2216b..4aa5bf0 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,6 @@
 - Using Kotlin DSL build.gradle.kts
 - Elegant call using injector()
 - Shimmer Effect, Empty View Effect, Nested Recycler View, Progress Recycler View
-- Jetpack Compose UI (Beta Experimental) - FrogoRecyclerCompose [Click Here](https://github.com/amirisback/frogo-recycler-view/blob/master/docs/tutorial/FrogoRecyclerCompose.md)
-
 
 <a href="https://play.google.com/store/apps/details?id=com.frogobox.apprecycler">
   <img width="200px" height="75px" src="https://amirisback.github.io/amirisback/docs/image/google-play-badge.png">
@@ -47,7 +45,7 @@
 ## Version Release
 This Is Latest Release
 
-    $version_release = 4.3.2
+    $version_release = 4.3.3
 
 What's New??
 
@@ -92,14 +90,14 @@ allprojects {
 
     dependencies {
         // library frogo-recycler-view
-        implementation 'com.github.amirisback:frogo-recycler-view:4.3.2'
+        implementation 'com.github.amirisback:frogo-recycler-view:4.3.3'
     }
 
 #### <Option 2> Kotlin DSL Gradle
 
     dependencies {
         // library frogo-recycler-view
-        implementation("com.github.amirisback:frogo-recycler-view:4.3.2")
+        implementation("com.github.amirisback:frogo-recycler-view:4.3.3")
     }
 
 ### Step 3. Create xml view
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 01ab879..6e3584d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -56,11 +56,6 @@ android {
 
     buildFeatures {
         viewBinding = true
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = DependencyGradle.COMPOSE_VERSION
     }
 
     compileOptions {
@@ -87,11 +82,6 @@ dependencies {
     implementation(Androidx.Work.runtimeKtx)
     implementation(Androidx.Lifecycle.runtimeKtx)
 
-    implementation(Androidx.Compose.activity)
-    implementation(Androidx.Compose.material("1.3.1"))
-    implementation(Androidx.Compose.ui)
-    implementation(Androidx.Compose.uiToolingPreview)
-
     implementation(Google.material)
 
     implementation(GitHub.glide)
@@ -102,7 +92,4 @@ dependencies {
 
     kapt(GitHub.glideCompiler)
 
-    debugImplementation(Androidx.Compose.uiTooling)
-    debugImplementation(Androidx.Compose.uiTestManifest)
-
 }
diff --git a/app/src/main/java/com/frogobox/apprecycler/MainActivity.kt b/app/src/main/java/com/frogobox/apprecycler/MainActivity.kt
index 3270c9d..cae9de9 100644
--- a/app/src/main/java/com/frogobox/apprecycler/MainActivity.kt
+++ b/app/src/main/java/com/frogobox/apprecycler/MainActivity.kt
@@ -9,7 +9,6 @@ import com.frogobox.apprecycler.sample.java.noadapter.multiview.JavaNoAdapterMul
 import com.frogobox.apprecycler.sample.java.noadapter.simple.JavaNoAdapterActivity
 import com.frogobox.apprecycler.sample.java.usingadapter.JavaSampleActivity
 import com.frogobox.apprecycler.sample.kotlin.FrogoRvExtActivity
-import com.frogobox.apprecycler.sample.kotlin.compose.RecyclerComposeActivity
 import com.frogobox.apprecycler.sample.kotlin.noadapter.multiview.KotlinNoAdapterMultiVewActivity
 import com.frogobox.apprecycler.sample.kotlin.noadapter.progress.KotlinProgressActivity
 import com.frogobox.apprecycler.sample.kotlin.noadapter.shimmer.KotlinShimmerActivity
@@ -77,10 +76,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                 startActivity(Intent(this@MainActivity, KotlinNestedActivity::class.java))
             }
 
-            btnJetpackCompose.setOnClickListener {
-                startActivity(Intent(this@MainActivity, RecyclerComposeActivity::class.java))
-            }
-
             btnAnswerIssue1.setOnClickListener {
                 startActivity(Intent(this@MainActivity, AnswerIssueActivity::class.java))
             }
diff --git a/app/src/main/java/com/frogobox/apprecycler/sample/kotlin/compose/RecyclerComposeActivity.kt b/app/src/main/java/com/frogobox/apprecycler/sample/kotlin/compose/RecyclerComposeActivity.kt
deleted file mode 100644
index 5b15b05..0000000
--- a/app/src/main/java/com/frogobox/apprecycler/sample/kotlin/compose/RecyclerComposeActivity.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.frogobox.apprecycler.sample.kotlin.compose
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import com.frogobox.apprecycler.model.People
-import com.frogobox.apprecycler.sample.kotlin.noadapter.shimmer.KotlinShimmerActivity
-import com.frogobox.apprecycler.ui.theme.FrogoRecyclerViewTheme
-import com.frogobox.recycler.compose.FrogoLazyColumn
-
-class RecyclerComposeActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            DefaultPreview()
-        }
-    }
-}
-
-@Preview(
-    showBackground = true,
-    showSystemUi = true
-)
-@Composable
-fun DefaultPreview() {
-    FrogoRecyclerViewTheme {
-        FrogoLazyColumn(modifier = Modifier.padding(10.dp), data = setupData()) { data ->
-            ListMessage(data)
-        }
-    }
-}
-
-@Composable
-fun ListMessage(data: People) {
-    val context = LocalContext.current
-    Column(
-        Modifier
-            .padding(8.dp)
-            .clickable {
-                context.startActivity(Intent(context, KotlinShimmerActivity::class.java))
-            }) {
-        Text(text = data.name)
-        Text(text = data.role)
-    }
-}
-
-fun setupData(): MutableList<People> {
-    val data = mutableListOf<People>()
-    data.add(People("Amir", "Programmer"))
-    data.add(People("Amir", "Programmer"))
-    data.add(People("Amir", "Programmer"))
-    data.add(People("Amir", "Programmer"))
-    data.add(People("Amir", "Programmer"))
-    return data
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ef53dc7..09a33ef 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -194,28 +194,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/btn_nested_simple" />
 
-        <TextView
-            android:id="@+id/tv_title_6"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:text="Jetpack Compose (Experimental)"
-            android:textColor="@color/frogoColorBlack"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btn_nested" />
-
-        <Button
-            android:id="@+id/btn_jetpack_compose"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/frogo_dimen_8dp"
-            android:background="@drawable/frogo_bg_cyan_32dp"
-            android:text="Frogo Recycler Compose"
-            android:textColor="@color/frogoColorWhite"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_title_6" />
-
         <TextView
             android:id="@+id/tv_title_7"
             android:layout_width="wrap_content"
@@ -224,7 +202,7 @@
             android:text="Solving Issue"
             android:textColor="@color/frogoColorBlack"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btn_jetpack_compose" />
+            app:layout_constraintTop_toBottomOf="@+id/btn_nested" />
 
         <Button
             android:id="@+id/btn_answer_issue_1"
diff --git a/build.gradle.kts b/build.gradle.kts
index 38e177c..70a0d31 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "7.3.1" apply false
-    id("com.android.library") version "7.3.1" apply false
+    id("com.android.application") version "7.4.0" apply false
+    id("com.android.library") version "7.4.0" apply false
     id("org.jetbrains.kotlin.android") version DependencyGradle.KOTLIN_VERSION apply false
 }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 1a1fff8..c26e0c4 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -12,6 +12,6 @@ repositories {
 dependencies{
 
     // library frogo-build-src
-    implementation("com.github.frogobox:open-build-src:2.0.7")
+    implementation("com.github.frogobox:open-build-src:2.0.9")
 
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/ProjectSetting.kt b/buildSrc/src/main/kotlin/ProjectSetting.kt
index ec45a45..c2c50b3 100644
--- a/buildSrc/src/main/kotlin/ProjectSetting.kt
+++ b/buildSrc/src/main/kotlin/ProjectSetting.kt
@@ -24,7 +24,7 @@ object ProjectSetting {
 
     const val VERSION_MAJOR = 4
     const val VERSION_MINOR = 3
-    const val VERSION_PATCH = 2
+    const val VERSION_PATCH = 3
 
     const val PROJECT_MIN_SDK = Version.Gradle.minSdk
     const val PROJECT_COMPILE_SDK = Version.Gradle.compileSdk
diff --git a/frogorecyclerview/build.gradle.kts b/frogorecyclerview/build.gradle.kts
index c8c952f..9ff40a0 100644
--- a/frogorecyclerview/build.gradle.kts
+++ b/frogorecyclerview/build.gradle.kts
@@ -37,11 +37,6 @@ android {
 
     buildFeatures {
         viewBinding = true
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = DependencyGradle.COMPOSE_VERSION
     }
 
     compileOptions {
@@ -58,16 +53,7 @@ android {
 }
 
 dependencies {
-
-    api(Androidx.Compose.uiToolingPreview)
-    api(Androidx.Compose.activity)
-    api(Androidx.Compose.ui)
-    api(Androidx.Compose.material("1.3.1"))
     api(Google.material)
-
-    debugImplementation(Androidx.Compose.uiTooling)
-    debugImplementation(Androidx.Compose.uiTestManifest)
-
 }
 
 afterEvaluate {
diff --git a/frogorecyclerview/src/main/java/com/frogobox/recycler/compose/FrogoRecyclerCompose.kt b/frogorecyclerview/src/main/java/com/frogobox/recycler/compose/FrogoRecyclerCompose.kt
deleted file mode 100644
index 82e701d..0000000
--- a/frogorecyclerview/src/main/java/com/frogobox/recycler/compose/FrogoRecyclerCompose.kt
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.frogobox.recycler.compose
-
-import androidx.compose.foundation.gestures.FlingBehavior
-import androidx.compose.foundation.gestures.ScrollableDefaults
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.lazy.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.frogobox.recycler.core.FrogoRvConstant.FROGO_RV_COMPOSE_TAG
-import com.frogobox.recycler.util.FLog
-
-/*
- * Created by faisalamir on 21/08/21
- * FrogoRecyclerView
- * -----------------------------------------
- * Name     : Muhammad Faisal Amir
- * E-mail   : faisalamircs@gmail.com
- * Github   : github.com/amirisback
- * -----------------------------------------
- * Copyright (C) 2021 FrogoBox Inc.      
- * All rights reserved
- *
- */
-
-@Composable
-fun <T> FrogoLazyColumn(
-    data: List<T>,
-    modifier: Modifier = Modifier,
-    state: LazyListState = rememberLazyListState(),
-    contentPadding: PaddingValues = PaddingValues(0.dp),
-    reverseLayout: Boolean = false,
-    verticalArrangement: Arrangement.Vertical =
-        if (!reverseLayout) Arrangement.Top else Arrangement.Bottom,
-    horizontalAlignment: Alignment.Horizontal = Alignment.Start,
-    flingBehavior: FlingBehavior = ScrollableDefaults.flingBehavior(),
-    content: @Composable() LazyItemScope.(data: T) -> Unit
-
-) {
-    FLog.d("$FROGO_RV_COMPOSE_TAG - FrogoLazyColumn")
-    FLog.d("$FROGO_RV_COMPOSE_TAG - sum data : ${data.size}")
-    LazyColumn(
-        modifier = modifier,
-        state = state,
-        contentPadding = contentPadding,
-        flingBehavior = flingBehavior,
-        horizontalAlignment = horizontalAlignment,
-        verticalArrangement = verticalArrangement,
-        reverseLayout = reverseLayout
-    ) {
-        items(data.size) { index ->
-            FLog.d("$FROGO_RV_COMPOSE_TAG - list data $index : ${data[index]}")
-            content(data[index])
-        }
-    }
-}
-
-@Composable
-fun <T> FrogoLazyRow(
-    data: List<T>,
-    modifier: Modifier = Modifier,
-    state: LazyListState = rememberLazyListState(),
-    contentPadding: PaddingValues = PaddingValues(0.dp),
-    reverseLayout: Boolean = false,
-    horizontalArrangement: Arrangement.Horizontal =
-        if (!reverseLayout) Arrangement.Start else Arrangement.End,
-    verticalAlignment: Alignment.Vertical = Alignment.Top,
-    flingBehavior: FlingBehavior = ScrollableDefaults.flingBehavior(),
-    content: @Composable() LazyItemScope.(data: T) -> Unit
-) {
-    FLog.d("$FROGO_RV_COMPOSE_TAG - FrogoLazyRow")
-    FLog.d("$FROGO_RV_COMPOSE_TAG - sum data : ${data.size}")
-    LazyRow(
-        modifier = modifier,
-        state = state,
-        contentPadding = contentPadding,
-        verticalAlignment = verticalAlignment,
-        horizontalArrangement = horizontalArrangement,
-        flingBehavior = flingBehavior,
-        reverseLayout = reverseLayout
-    ) {
-        items(data.size) { index ->
-            FLog.d("$FROGO_RV_COMPOSE_TAG - list data : ${data[index]}")
-            content(data[index])
-        }
-    }
-}
-
-//@ExperimentalFoundationApi
-//@Composable
-//fun <T> FrogoLazyFixedGrid(
-//    data: List<T>,
-//    spanCount: Int,
-//    modifier: Modifier = Modifier,
-//    state: LazyListState = rememberLazyListState(),
-//    contentPadding: PaddingValues = PaddingValues(0.dp),
-//    content: @Composable() LazyGridScope.(data: T) -> Unit
-//) {
-//    FLog.d("$FROGO_RV_COMPOSE_TAG - FrogoLazyFixedGrid")
-//    FLog.d("$FROGO_RV_COMPOSE_TAG - sum data : ${data.size}")
-//    LazyVerticalGrid(
-//        modifier = modifier,
-//        contentPadding = contentPadding,
-//        state = state,
-//        cells = GridCells.Fixed(spanCount),
-//    ) {
-//        items(data.size) { index ->
-//            FLog.d("$FROGO_RV_COMPOSE_TAG - list data : ${data[index]}")
-//            this@LazyVerticalGrid.content(data[index])
-//        }
-//    }
-//}
-//
-//@ExperimentalFoundationApi
-//@Composable
-//fun <T> FrogoLazyAdaptiveGrid(
-//    data: List<T>,
-//    minSize: Dp,
-//    modifier: Modifier = Modifier,
-//    state: LazyListState = rememberLazyListState(),
-//    contentPadding: PaddingValues = PaddingValues(0.dp),
-//    content: @Composable() LazyGridScope.(data: T) -> Unit
-//) {
-//    FLog.d("$FROGO_RV_COMPOSE_TAG - FrogoLazyAdaptiveGrid")
-//    FLog.d("$FROGO_RV_COMPOSE_TAG - sum data : ${data.size}")
-//
-//    LazyVerticalGrid(
-//        modifier = modifier,
-//        contentPadding = contentPadding,
-//        state = state,
-//        cells = GridCells.Adaptive(minSize),
-//    ) {
-//        items(data.size) { index ->
-//            FLog.d("$FROGO_RV_COMPOSE_TAG - list data : ${data[index]}")
-//            this@LazyVerticalGrid.content(data[index])
-//        }
-//    }
-//
-//}
\ No newline at end of file
diff --git a/frogorecyclerview/src/main/java/com/frogobox/recycler/shimmer/Shimmer.java b/frogorecyclerview/src/main/java/com/frogobox/recycler/shimmer/Shimmer.java
index a78cf0e..9cc9cbe 100644
--- a/frogorecyclerview/src/main/java/com/frogobox/recycler/shimmer/Shimmer.java
+++ b/frogorecyclerview/src/main/java/com/frogobox/recycler/shimmer/Shimmer.java
@@ -1,11 +1,3 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 package com.frogobox.recycler.shimmer;
 
 import android.animation.ValueAnimator;
diff --git a/frogorecyclerview/src/main/java/com/frogobox/recycler/shimmer/ShimmerDrawable.kt b/frogorecyclerview/src/main/java/com/frogobox/recycler/shimmer/ShimmerDrawable.kt
index fd99e7d..6af24f6 100644
--- a/frogorecyclerview/src/main/java/com/frogobox/recycler/shimmer/ShimmerDrawable.kt
+++ b/frogorecyclerview/src/main/java/com/frogobox/recycler/shimmer/ShimmerDrawable.kt
@@ -1,236 +1,207 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.frogobox.recycler.shimmer;
-
-import android.animation.ValueAnimator;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.LinearGradient;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.RadialGradient;
-import android.graphics.Rect;
-import android.graphics.Shader;
-import android.graphics.drawable.Drawable;
-import android.view.animation.LinearInterpolator;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-
-public final class ShimmerDrawable extends Drawable {
-    private final ValueAnimator.AnimatorUpdateListener mUpdateListener =
-            new ValueAnimator.AnimatorUpdateListener() {
-                @Override
-                public void onAnimationUpdate(ValueAnimator animation) {
-                    invalidateSelf();
-                }
-            };
-
-    private final Paint mShimmerPaint = new Paint();
-    private final Rect mDrawRect = new Rect();
-    private final Matrix mShaderMatrix = new Matrix();
-
-    private @Nullable
-    ValueAnimator mValueAnimator;
-
-    private @Nullable
-    Shimmer mShimmer;
-
-    public ShimmerDrawable() {
-        mShimmerPaint.setAntiAlias(true);
-    }
+package com.frogobox.recycler.shimmer
 
-    public void setShimmer(@Nullable Shimmer shimmer) {
-        mShimmer = shimmer;
-        if (mShimmer != null) {
-            mShimmerPaint.setXfermode(
-                    new PorterDuffXfermode(
-                            mShimmer.alphaShimmer ? PorterDuff.Mode.DST_IN : PorterDuff.Mode.SRC_IN));
-        }
-        updateShader();
-        updateValueAnimator();
-        invalidateSelf();
-    }
+import android.animation.ValueAnimator
+import android.animation.ValueAnimator.AnimatorUpdateListener
+import android.graphics.*
+import android.graphics.drawable.Drawable
+import android.view.animation.LinearInterpolator
+
+class ShimmerDrawable : Drawable() {
+    private val mUpdateListener = AnimatorUpdateListener { invalidateSelf() }
+    private val mShimmerPaint = Paint()
+    private val mDrawRect = Rect()
+    private val mShaderMatrix = Matrix()
 
-    public @Nullable
-    Shimmer getShimmer() {
-        return mShimmer;
+    private var mValueAnimator: ValueAnimator? = null
+    private var mShimmer: Shimmer? = null
+
+    init {
+        mShimmerPaint.isAntiAlias = true
     }
 
+    var shimmer: Shimmer?
+        get() = mShimmer
+        set(shimmer) {
+            mShimmer = shimmer
+            if (mShimmer != null) {
+                mShimmerPaint.xfermode = PorterDuffXfermode(
+                    if (mShimmer!!.alphaShimmer) PorterDuff.Mode.DST_IN else PorterDuff.Mode.SRC_IN
+                )
+            }
+            updateShader()
+            updateValueAnimator()
+            invalidateSelf()
+        }
+
     /**
      * Starts the shimmer animation.
      */
-    public void startShimmer() {
-        if (mValueAnimator != null && !isShimmerStarted() && getCallback() != null) {
-            mValueAnimator.start();
+    fun startShimmer() {
+        if (mValueAnimator != null && !isShimmerStarted && callback != null) {
+            mValueAnimator!!.start()
         }
     }
 
     /**
      * Stops the shimmer animation.
      */
-    public void stopShimmer() {
-        if (mValueAnimator != null && isShimmerStarted()) {
-            mValueAnimator.cancel();
+    fun stopShimmer() {
+        if (mValueAnimator != null && isShimmerStarted) {
+            mValueAnimator!!.cancel()
         }
     }
 
     /**
      * Return whether the shimmer animation has been started.
      */
-    public boolean isShimmerStarted() {
-        return mValueAnimator != null && mValueAnimator.isStarted();
+    val isShimmerStarted: Boolean
+        get() = mValueAnimator != null && mValueAnimator!!.isStarted
+
+    public override fun onBoundsChange(bounds: Rect) {
+        super.onBoundsChange(bounds)
+        mDrawRect.set(bounds)
+        updateShader()
+        maybeStartShimmer()
     }
 
-    @Override
-    public void onBoundsChange(Rect bounds) {
-        super.onBoundsChange(bounds);
-        mDrawRect.set(bounds);
-        updateShader();
-        maybeStartShimmer();
-    }
-
-    @Override
-    public void draw(@NonNull Canvas canvas) {
-        if (mShimmer == null || mShimmerPaint.getShader() == null) {
-            return;
+    override fun draw(canvas: Canvas) {
+        if (mShimmer == null || mShimmerPaint.shader == null) {
+            return
         }
-
-        final float tiltTan = (float) Math.tan(Math.toRadians(mShimmer.tilt));
-        final float translateHeight = mDrawRect.height() + tiltTan * mDrawRect.width();
-        final float translateWidth = mDrawRect.width() + tiltTan * mDrawRect.height();
-        final float dx;
-        final float dy;
-        final float animatedValue =
-                mValueAnimator != null ? (float) mValueAnimator.getAnimatedValue() : 0f;
-        switch (mShimmer.direction) {
-            default:
-            case Shimmer.Direction.LEFT_TO_RIGHT:
-                dx = offset(-translateWidth, translateWidth, animatedValue);
-                dy = 0;
-                break;
-            case Shimmer.Direction.RIGHT_TO_LEFT:
-                dx = offset(translateWidth, -translateWidth, animatedValue);
-                dy = 0f;
-                break;
-            case Shimmer.Direction.TOP_TO_BOTTOM:
-                dx = 0f;
-                dy = offset(-translateHeight, translateHeight, animatedValue);
-                break;
-            case Shimmer.Direction.BOTTOM_TO_TOP:
-                dx = 0f;
-                dy = offset(translateHeight, -translateHeight, animatedValue);
-                break;
+        val tiltTan = Math.tan(Math.toRadians(mShimmer!!.tilt.toDouble())).toFloat()
+        val translateHeight = mDrawRect.height() + tiltTan * mDrawRect.width()
+        val translateWidth = mDrawRect.width() + tiltTan * mDrawRect.height()
+        val dx: Float
+        val dy: Float
+        val animatedValue =
+            if (mValueAnimator != null) mValueAnimator!!.animatedValue as Float else 0f
+        when (mShimmer!!.direction) {
+            Shimmer.Direction.LEFT_TO_RIGHT -> {
+                dx = offset(-translateWidth, translateWidth, animatedValue)
+                dy = 0f
+            }
+            Shimmer.Direction.RIGHT_TO_LEFT -> {
+                dx = offset(translateWidth, -translateWidth, animatedValue)
+                dy = 0f
+            }
+            Shimmer.Direction.TOP_TO_BOTTOM -> {
+                dx = 0f
+                dy = offset(-translateHeight, translateHeight, animatedValue)
+            }
+            Shimmer.Direction.BOTTOM_TO_TOP -> {
+                dx = 0f
+                dy = offset(translateHeight, -translateHeight, animatedValue)
+            }
+            else -> {
+                dx = offset(-translateWidth, translateWidth, animatedValue)
+                dy = 0f
+            }
         }
-
-        mShaderMatrix.reset();
-        mShaderMatrix.setRotate(mShimmer.tilt, mDrawRect.width() / 2f, mDrawRect.height() / 2f);
-        mShaderMatrix.postTranslate(dx, dy);
-        mShimmerPaint.getShader().setLocalMatrix(mShaderMatrix);
-        canvas.drawRect(mDrawRect, mShimmerPaint);
+        mShaderMatrix.reset()
+        mShaderMatrix.setRotate(mShimmer!!.tilt, mDrawRect.width() / 2f, mDrawRect.height() / 2f)
+        mShaderMatrix.postTranslate(dx, dy)
+        mShimmerPaint.shader.setLocalMatrix(mShaderMatrix)
+        canvas.drawRect(mDrawRect, mShimmerPaint)
     }
 
-    @Override
-    public void setAlpha(int alpha) {
+    override fun setAlpha(alpha: Int) {
         // No-op, modify the Shimmer object you pass in instead
     }
 
-    @Override
-    public void setColorFilter(@Nullable ColorFilter colorFilter) {
+    override fun setColorFilter(colorFilter: ColorFilter?) {
         // No-op, modify the Shimmer object you pass in instead
     }
 
-    @Override
-    public int getOpacity() {
-        return mShimmer != null && (mShimmer.clipToChildren || mShimmer.alphaShimmer)
-                ? PixelFormat.TRANSLUCENT
-                : PixelFormat.OPAQUE;
+    override fun getOpacity(): Int {
+        return if (mShimmer != null && (mShimmer!!.clipToChildren || mShimmer!!.alphaShimmer)) PixelFormat.TRANSLUCENT else PixelFormat.OPAQUE
     }
 
-    private float offset(float start, float end, float percent) {
-        return start + (end - start) * percent;
+    private fun offset(start: Float, end: Float, percent: Float): Float {
+        return start + (end - start) * percent
     }
 
-    private void updateValueAnimator() {
+    private fun updateValueAnimator() {
         if (mShimmer == null) {
-            return;
+            return
         }
-
-        final boolean started;
+        val started: Boolean
         if (mValueAnimator != null) {
-            started = mValueAnimator.isStarted();
-            mValueAnimator.cancel();
-            mValueAnimator.removeAllUpdateListeners();
+            started = mValueAnimator!!.isStarted
+            mValueAnimator!!.cancel()
+            mValueAnimator!!.removeAllUpdateListeners()
         } else {
-            started = false;
+            started = false
         }
-
-        mValueAnimator =
-                ValueAnimator.ofFloat(0f, 1f + (float) (mShimmer.repeatDelay / mShimmer.animationDuration));
-        mValueAnimator.setInterpolator(new LinearInterpolator());
-        mValueAnimator.setRepeatMode(mShimmer.repeatMode);
-        mValueAnimator.setStartDelay(mShimmer.startDelay);
-        mValueAnimator.setRepeatCount(mShimmer.repeatCount);
-        mValueAnimator.setDuration(mShimmer.animationDuration + mShimmer.repeatDelay);
-        mValueAnimator.addUpdateListener(mUpdateListener);
+        mValueAnimator = ValueAnimator.ofFloat(
+            0f,
+            1f + (mShimmer!!.repeatDelay / mShimmer!!.animationDuration).toFloat()
+        )
+        mValueAnimator!!.interpolator = LinearInterpolator()
+        mValueAnimator!!.repeatMode = mShimmer!!.repeatMode
+        mValueAnimator!!.startDelay = mShimmer!!.startDelay
+        mValueAnimator!!.repeatCount = mShimmer!!.repeatCount
+        mValueAnimator!!.duration = mShimmer!!.animationDuration + mShimmer!!.repeatDelay
+        mValueAnimator!!.addUpdateListener(mUpdateListener)
         if (started) {
-            mValueAnimator.start();
+            mValueAnimator!!.start()
         }
     }
 
-    void maybeStartShimmer() {
-        if (mValueAnimator != null
-                && !mValueAnimator.isStarted()
-                && mShimmer != null
-                && mShimmer.autoStart
-                && getCallback() != null) {
-            mValueAnimator.start();
+    fun maybeStartShimmer() {
+        if (mValueAnimator != null && !mValueAnimator!!.isStarted && mShimmer != null && mShimmer!!.autoStart && callback != null) {
+            mValueAnimator!!.start()
         }
     }
 
-    private void updateShader() {
-        final Rect bounds = getBounds();
-        final int boundsWidth = bounds.width();
-        final int boundsHeight = bounds.height();
+    private fun updateShader() {
+        val bounds = bounds
+        val boundsWidth = bounds.width()
+        val boundsHeight = bounds.height()
         if (boundsWidth == 0 || boundsHeight == 0 || mShimmer == null) {
-            return;
+            return
         }
-        final int width = mShimmer.width(boundsWidth);
-        final int height = mShimmer.height(boundsHeight);
-
-        final Shader shader;
-        switch (mShimmer.shape) {
-            default:
-            case Shimmer.Shape.LINEAR:
-                boolean vertical =
-                        mShimmer.direction == Shimmer.Direction.TOP_TO_BOTTOM
-                                || mShimmer.direction == Shimmer.Direction.BOTTOM_TO_TOP;
-                int endX = vertical ? 0 : width;
-                int endY = vertical ? height : 0;
-                shader = new LinearGradient(
-                                0, 0, endX, endY, mShimmer.colors, mShimmer.positions, Shader.TileMode.CLAMP);
-                break;
-            case Shimmer.Shape.RADIAL:
-                shader = new RadialGradient(
-                                width / 2f,
-                                height / 2f,
-                                (float) (Math.max(width, height) / Math.sqrt(2)),
-                                mShimmer.colors,
-                                mShimmer.positions,
-                                Shader.TileMode.CLAMP);
-                break;
+        val width = mShimmer!!.width(boundsWidth)
+        val height = mShimmer!!.height(boundsHeight)
+        val shader: Shader
+        shader = when (mShimmer!!.shape) {
+            Shimmer.Shape.LINEAR -> {
+                val vertical = (mShimmer!!.direction == Shimmer.Direction.TOP_TO_BOTTOM
+                        || mShimmer!!.direction == Shimmer.Direction.BOTTOM_TO_TOP)
+                val endX = if (vertical) 0 else width
+                val endY = if (vertical) height else 0
+                LinearGradient(
+                    0f,
+                    0f,
+                    endX.toFloat(),
+                    endY.toFloat(),
+                    mShimmer!!.colors,
+                    mShimmer!!.positions,
+                    Shader.TileMode.CLAMP
+                )
+            }
+            Shimmer.Shape.RADIAL -> RadialGradient(
+                width / 2f,
+                height / 2f, (Math.max(width, height) / Math.sqrt(2.0)).toFloat(),
+                mShimmer!!.colors,
+                mShimmer!!.positions,
+                Shader.TileMode.CLAMP
+            )
+            else -> {
+                val vertical = (mShimmer!!.direction == Shimmer.Direction.TOP_TO_BOTTOM
+                        || mShimmer!!.direction == Shimmer.Direction.BOTTOM_TO_TOP)
+                val endX = if (vertical) 0 else width
+                val endY = if (vertical) height else 0
+                LinearGradient(
+                    0f,
+                    0f,
+                    endX.toFloat(),
+                    endY.toFloat(),
+                    mShimmer!!.colors,
+                    mShimmer!!.positions,
+                    Shader.TileMode.CLAMP
+                )
+            }
         }
-
-        mShimmerPaint.setShader(shader);
+        mShimmerPaint.shader = shader
     }
-}
+}
\ No newline at end of file
diff --git a/frogorecyclerview/src/main/java/com/frogobox/recycler/shimmer/ShimmerFrameLayout.kt b/frogorecyclerview/src/main/java/com/frogobox/recycler/shimmer/ShimmerFrameLayout.kt
index 4ab79e4..e1fe6d0 100644
--- a/frogorecyclerview/src/main/java/com/frogobox/recycler/shimmer/ShimmerFrameLayout.kt
+++ b/frogorecyclerview/src/main/java/com/frogobox/recycler/shimmer/ShimmerFrameLayout.kt
@@ -1,205 +1,175 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.frogobox.recycler.shimmer;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.frogobox.recycler.R;
-
+package com.frogobox.recycler.shimmer
+
+import android.annotation.TargetApi
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.util.AttributeSet
+import android.view.View
+import android.widget.FrameLayout
+import com.frogobox.recycler.R
 
 /**
- * Shimmer is an Android library that provides an easy way to add a shimmer effect to any {@link
- * View}. It is useful as an unobtrusive loading indicator, and was originally
+ * Shimmer is an Android library that provides an easy way to add a shimmer effect to any [ ]. It is useful as an unobtrusive loading indicator, and was originally
  * developed for Facebook Home.
  *
- * <p>Find more examples and usage instructions over at: facebook.github.io/shimmer-android
+ *
+ * Find more examples and usage instructions over at: facebook.github.io/shimmer-android
  */
-public class ShimmerFrameLayout extends FrameLayout {
-    private final Paint mContentPaint = new Paint();
-    private final ShimmerDrawable mShimmerDrawable = new ShimmerDrawable();
+class ShimmerFrameLayout : FrameLayout {
+    private val mContentPaint = Paint()
+    private val mShimmerDrawable: ShimmerDrawable? = ShimmerDrawable()
 
-    private boolean mShowShimmer = true;
-    private boolean mStoppedShimmerBecauseVisibility = false;
+    /**
+     * Return whether the shimmer drawable is visible.
+     */
+    var isShimmerVisible = true
+        private set
+    private var mStoppedShimmerBecauseVisibility = false
 
-    public ShimmerFrameLayout(Context context) {
-        super(context);
-        init(context, null);
+    constructor(context: Context) : super(context) {
+        init(context, null)
     }
 
-    public ShimmerFrameLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(context, attrs);
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+        init(context, attrs)
     }
 
-    public ShimmerFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(context, attrs);
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ) {
+        init(context, attrs)
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public ShimmerFrameLayout(
-            Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init(context, attrs);
+    constructor(
+        context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int
+    ) : super(context, attrs, defStyleAttr, defStyleRes) {
+        init(context, attrs)
     }
 
-    private void init(Context context, @Nullable AttributeSet attrs) {
-        setWillNotDraw(false);
-        mShimmerDrawable.setCallback(this);
-
+    private fun init(context: Context, attrs: AttributeSet?) {
+        setWillNotDraw(false)
+        mShimmerDrawable!!.callback = this
         if (attrs == null) {
-            setShimmer(new Shimmer.AlphaHighlightBuilder().build());
-            return;
+            setShimmer(Shimmer.AlphaHighlightBuilder().build())
+            return
         }
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ShimmerFrameLayout, 0, 0);
+        val a = context.obtainStyledAttributes(attrs, R.styleable.ShimmerFrameLayout, 0, 0)
         try {
-            Shimmer.Builder shimmerBuilder =
-                    a.hasValue(R.styleable.ShimmerFrameLayout_shimmer_colored)
-                            && a.getBoolean(R.styleable.ShimmerFrameLayout_shimmer_colored, false)
-                            ? new Shimmer.ColorHighlightBuilder()
-                            : new Shimmer.AlphaHighlightBuilder();
-            setShimmer(shimmerBuilder.consumeAttributes(a).build());
+            val shimmerBuilder = if (a.hasValue(R.styleable.ShimmerFrameLayout_shimmer_colored)
+                && a.getBoolean(R.styleable.ShimmerFrameLayout_shimmer_colored, false)
+            ) Shimmer.ColorHighlightBuilder() else Shimmer.AlphaHighlightBuilder()
+            setShimmer(shimmerBuilder.consumeAttributes(a)!!.build())
         } finally {
-            a.recycle();
+            a.recycle()
         }
     }
 
-    public ShimmerFrameLayout setShimmer(@Nullable Shimmer shimmer) {
-        mShimmerDrawable.setShimmer(shimmer);
+    fun setShimmer(shimmer: Shimmer?): ShimmerFrameLayout {
+        mShimmerDrawable!!.shimmer = shimmer
         if (shimmer != null && shimmer.clipToChildren) {
-            setLayerType(LAYER_TYPE_HARDWARE, mContentPaint);
+            setLayerType(LAYER_TYPE_HARDWARE, mContentPaint)
         } else {
-            setLayerType(LAYER_TYPE_NONE, null);
+            setLayerType(LAYER_TYPE_NONE, null)
         }
-
-        return this;
+        return this
     }
 
-    public @Nullable
-    Shimmer getShimmer() {
-        return mShimmerDrawable.getShimmer();
-    }
+    val shimmer: Shimmer?
+        get() = mShimmerDrawable!!.shimmer
 
     /**
      * Starts the shimmer animation.
      */
-    public void startShimmer() {
-        mShimmerDrawable.startShimmer();
+    fun startShimmer() {
+        mShimmerDrawable!!.startShimmer()
     }
 
     /**
      * Stops the shimmer animation.
      */
-    public void stopShimmer() {
-        mStoppedShimmerBecauseVisibility = false;
-        mShimmerDrawable.stopShimmer();
+    fun stopShimmer() {
+        mStoppedShimmerBecauseVisibility = false
+        mShimmerDrawable!!.stopShimmer()
     }
 
     /**
      * Return whether the shimmer animation has been started.
      */
-    public boolean isShimmerStarted() {
-        return mShimmerDrawable.isShimmerStarted();
-    }
+    val isShimmerStarted: Boolean
+        get() = mShimmerDrawable!!.isShimmerStarted
 
     /**
      * Sets the ShimmerDrawable to be visible.
      *
      * @param startShimmer Whether to start the shimmer again.
      */
-    public void showShimmer(boolean startShimmer) {
-        mShowShimmer = true;
+    fun showShimmer(startShimmer: Boolean) {
+        isShimmerVisible = true
         if (startShimmer) {
-            startShimmer();
+            startShimmer()
         }
-        invalidate();
+        invalidate()
     }
 
     /**
      * Sets the ShimmerDrawable to be invisible, stopping it in the process.
      */
-    public void hideShimmer() {
-        stopShimmer();
-        mShowShimmer = false;
-        invalidate();
-    }
-
-    /**
-     * Return whether the shimmer drawable is visible.
-     */
-    public boolean isShimmerVisible() {
-        return mShowShimmer;
+    fun hideShimmer() {
+        stopShimmer()
+        isShimmerVisible = false
+        invalidate()
     }
 
-    @Override
-    public void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        super.onLayout(changed, left, top, right, bottom);
-        final int width = getWidth();
-        final int height = getHeight();
-        mShimmerDrawable.setBounds(0, 0, width, height);
+    public override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        super.onLayout(changed, left, top, right, bottom)
+        val width = width
+        val height = height
+        mShimmerDrawable!!.setBounds(0, 0, width, height)
     }
 
-    @Override
-    protected void onVisibilityChanged(View changedView, int visibility) {
-        super.onVisibilityChanged(changedView, visibility);
+    override fun onVisibilityChanged(changedView: View, visibility: Int) {
+        super.onVisibilityChanged(changedView, visibility)
         // View's constructor directly invokes this method, in which case no fields on
         // this class have been fully initialized yet.
         if (mShimmerDrawable == null) {
-            return;
+            return
         }
-        if (visibility != View.VISIBLE) {
+        if (visibility != VISIBLE) {
             // GONE or INVISIBLE
-            if (isShimmerStarted()) {
-                stopShimmer();
-                mStoppedShimmerBecauseVisibility = true;
+            if (isShimmerStarted) {
+                stopShimmer()
+                mStoppedShimmerBecauseVisibility = true
             }
         } else if (mStoppedShimmerBecauseVisibility) {
-            mShimmerDrawable.maybeStartShimmer();
-            mStoppedShimmerBecauseVisibility = false;
+            mShimmerDrawable.maybeStartShimmer()
+            mStoppedShimmerBecauseVisibility = false
         }
     }
 
-    @Override
-    public void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        mShimmerDrawable.maybeStartShimmer();
+    public override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        mShimmerDrawable!!.maybeStartShimmer()
     }
 
-    @Override
-    public void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        stopShimmer();
+    public override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        stopShimmer()
     }
 
-    @Override
-    public void dispatchDraw(Canvas canvas) {
-        super.dispatchDraw(canvas);
-        if (mShowShimmer) {
-            mShimmerDrawable.draw(canvas);
+    public override fun dispatchDraw(canvas: Canvas) {
+        super.dispatchDraw(canvas)
+        if (isShimmerVisible) {
+            mShimmerDrawable!!.draw(canvas)
         }
     }
 
-    @Override
-    protected boolean verifyDrawable(@NonNull Drawable who) {
-        return super.verifyDrawable(who) || who == mShimmerDrawable;
+    override fun verifyDrawable(who: Drawable): Boolean {
+        return super.verifyDrawable(who) || who === mShimmerDrawable
     }
-}
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d17593d..edb32be 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip