diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f47e595..e76cb53 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,13 +7,11 @@ maven-junit = "5.9.1"
 maven-assertj = "3.23.1"
 google-androidx-core = "1.9.0"
 google-androidx-annotation = "1.5.0"
-google-gson = "2.10"
 google-androidtest = "1.5.0"
 google-androidtestRunner = "1.5.1"
 google-androidtestext = "1.1.4"
 google-espresso = "3.5.0"
 google-appcompat = "1.5.1"
-google-material = "1.7.0"
 google-constraintLayout = "2.1.4"
 
 [libraries]
@@ -24,14 +22,12 @@ junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "mav
 assertj-core = { module = "org.assertj:assertj-core", version.ref = "maven-assertj" }
 androidx-core = { module = "androidx.core:core", version.ref = "google-androidx-core" }
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "google-androidx-annotation" }
-gson = { module = "com.google.code.gson:gson", version.ref = "google-gson" }
 androidtest-core = { module = "androidx.test:core", version.ref = "google-androidtest" }
 androidtest-runner = { module = "androidx.test:runner", version.ref = "google-androidtestRunner" }
 androidtest-rules = { module = "androidx.test:rules", version.ref = "google-androidtest" }
 androidtest-junitext = { module = "androidx.test.ext:junit-ktx", version.ref = "google-androidtestext" }
 espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "google-espresso" }
 appcompat-core = { module = "androidx.appcompat:appcompat", version.ref = "google-appcompat" }
-material-core = { module = "com.google.android.material:material", version.ref = "google-material" }
 constraintlayout-core = { module = "androidx.constraintlayout:constraintlayout", version.ref = "google-constraintLayout" }
 
 [plugins]
diff --git a/sample/build.gradle b/sample/build.gradle
index df41cf6..ff3bede 100755
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -7,9 +7,13 @@ android {
   defaultConfig {
     applicationId "io.github.usefulness.shimmer.sample"
   }
+  buildFeatures {
+    viewBinding = true
+  }
 }
 
 dependencies {
   implementation("io.github.usefulness:shimmer-android-core")
+  implementation(libs.appcompat.core)
   implementation(libs.constraintlayout.core)
 }
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index f78920d..8268baa 100755
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -3,14 +3,14 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
-    android:allowBackup="false"
     android:hardwareAccelerated="true"
     android:icon="@drawable/icon"
     android:label="@string/app_name"
     >
     <activity
-      android:name="com.facebook.shimmer.sample.MainActivity"
+      android:name=".MainActivity"
       android:exported="true"
+      android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
       >
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
diff --git a/sample/src/main/java/com/facebook/shimmer/sample/MainActivity.kt b/sample/src/main/java/com/facebook/shimmer/sample/MainActivity.kt
deleted file mode 100644
index 4c9da69..0000000
--- a/sample/src/main/java/com/facebook/shimmer/sample/MainActivity.kt
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * 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.facebook.shimmer.sample
-
-import android.animation.ValueAnimator
-import android.app.Activity
-import android.os.Bundle
-import android.view.View
-import android.widget.Button
-import android.widget.Toast
-import com.facebook.shimmer.Shimmer
-import com.facebook.shimmer.ShimmerFrameLayout
-import io.github.usefulness.shimmer.sample.R
-
-class MainActivity : Activity(), View.OnClickListener {
-    private lateinit var shimmerViewContainer: ShimmerFrameLayout
-    private lateinit var presetButtons: Array<Button>
-    private var currentPreset = -1
-    private var toast: Toast? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.main)
-        shimmerViewContainer = findViewById(R.id.shimmer_view_container)
-        presetButtons = arrayOf(
-            findViewById(R.id.preset_button0),
-            findViewById(R.id.preset_button1),
-            findViewById(R.id.preset_button2),
-            findViewById(R.id.preset_button3),
-            findViewById(R.id.preset_button4),
-            findViewById(R.id.preset_button5),
-            findViewById(R.id.preset_button6),
-        )
-        presetButtons.forEach { it.setOnClickListener(this@MainActivity) }
-        selectPreset(0, false)
-    }
-
-    override fun onClick(v: View) {
-        selectPreset(presetButtons.indexOf(v as Button), true)
-    }
-
-    public override fun onResume() {
-        super.onResume()
-        shimmerViewContainer.startShimmer()
-    }
-
-    public override fun onPause() {
-        shimmerViewContainer.stopShimmer()
-        super.onPause()
-    }
-
-    private fun selectPreset(preset: Int, showToast: Boolean) {
-        if (currentPreset == preset) {
-            return
-        }
-
-        if (currentPreset >= 0) {
-            presetButtons[currentPreset].setBackgroundResource(R.color.preset_button_background)
-        }
-        currentPreset = preset
-        presetButtons[currentPreset].setBackgroundResource(R.color.preset_button_background_selected)
-
-        // If a toast is already showing, hide it
-        toast?.cancel()
-
-        val shimmerBuilder = Shimmer.AlphaHighlightBuilder()
-        shimmerViewContainer.setShimmer(
-            when (preset) {
-                1 -> {
-                    // Slow and reverse
-                    toast = Toast.makeText(this, "Slow and reverse", Toast.LENGTH_SHORT)
-                    shimmerBuilder.setDuration(5000L).setRepeatMode(ValueAnimator.REVERSE)
-                }
-
-                2 -> {
-                    // Thin, straight and transparent
-                    toast = Toast.makeText(this, "Thin, straight and transparent", Toast.LENGTH_SHORT)
-                    shimmerBuilder.setBaseAlpha(0.1f).setDropoff(0.1f).setTilt(0f)
-                }
-
-                3 -> {
-                    // Sweep angle 90
-                    toast = Toast.makeText(this, "Sweep angle 90", Toast.LENGTH_SHORT)
-                    shimmerBuilder.setDirection(Shimmer.Direction.TOP_TO_BOTTOM).setTilt(0f)
-                }
-
-                4 -> {
-                    // Spotlight
-                    toast = Toast.makeText(this, "Spotlight", Toast.LENGTH_SHORT)
-                    shimmerBuilder
-                        .setBaseAlpha(0f)
-                        .setDuration(2000L)
-                        .setDropoff(0.1f)
-                        .setIntensity(0.35f)
-                        .setShape(Shimmer.Shape.RADIAL)
-                }
-
-                5 -> {
-                    // Spotlight angle 45
-                    toast = Toast.makeText(this, "Spotlight angle 45", Toast.LENGTH_SHORT)
-                    shimmerBuilder
-                        .setBaseAlpha(0f)
-                        .setDuration(2000L)
-                        .setDropoff(0.1f)
-                        .setIntensity(0.35f)
-                        .setTilt(45f)
-                        .setShape(Shimmer.Shape.RADIAL)
-                }
-
-                6 -> {
-                    // Off
-                    toast = Toast.makeText(this, "Off", Toast.LENGTH_SHORT)
-                    null
-                }
-
-                else -> {
-                    toast = Toast.makeText(this, "Default", Toast.LENGTH_SHORT)
-                    shimmerBuilder
-                }
-            }?.build(),
-        )
-
-        // Show toast describing the chosen preset, if necessary
-        if (showToast) {
-            toast?.show()
-        }
-    }
-}
diff --git a/sample/src/main/kotlin/io/github/usefulness/shimmer/sample/MainActivity.kt b/sample/src/main/kotlin/io/github/usefulness/shimmer/sample/MainActivity.kt
new file mode 100644
index 0000000..765095b
--- /dev/null
+++ b/sample/src/main/kotlin/io/github/usefulness/shimmer/sample/MainActivity.kt
@@ -0,0 +1,121 @@
+package io.github.usefulness.shimmer.sample
+
+import android.animation.ValueAnimator
+import android.os.Bundle
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import com.facebook.shimmer.Shimmer
+import io.github.usefulness.shimmer.sample.databinding.MainBinding
+
+class MainActivity : AppCompatActivity() {
+
+    private var toast: Toast? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val binding = MainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.presetButtons.forEachIndexed { index, button ->
+            button.setOnClickListener {
+                binding.selectPreset(preset = index, showToast = true)
+            }
+        }
+        binding.selectPreset(preset = 0, showToast = false)
+        lifecycle.addObserver(
+            object : DefaultLifecycleObserver {
+
+                override fun onResume(owner: LifecycleOwner) {
+                    binding.shimmerViewContainer.startShimmer()
+                }
+
+                override fun onPause(owner: LifecycleOwner) {
+                    binding.shimmerViewContainer.stopShimmer()
+                }
+            },
+        )
+    }
+
+    private fun MainBinding.selectPreset(preset: Int, showToast: Boolean) {
+        val context = root.context
+
+        presetButtons.forEach { it.setBackgroundResource(R.color.preset_button_background) }
+        presetButtons[preset].setBackgroundResource(R.color.preset_button_background_selected)
+
+        // If a toast is already showing, hide it
+        toast?.cancel()
+
+        val shimmerBuilder = Shimmer.AlphaHighlightBuilder()
+        shimmerViewContainer.shimmer = when (preset) {
+            1 -> {
+                // Slow and reverse
+                toast = Toast.makeText(context, "Slow and reverse", Toast.LENGTH_SHORT)
+                shimmerBuilder.setDuration(5000L).setRepeatMode(ValueAnimator.REVERSE)
+            }
+
+            2 -> {
+                // Thin, straight and transparent
+                toast = Toast.makeText(context, "Thin, straight and transparent", Toast.LENGTH_SHORT)
+                shimmerBuilder.setBaseAlpha(0.1f).setDropoff(0.1f).setTilt(0f)
+            }
+
+            3 -> {
+                // Sweep angle 90
+                toast = Toast.makeText(context, "Sweep angle 90", Toast.LENGTH_SHORT)
+                shimmerBuilder.setDirection(Shimmer.Direction.TOP_TO_BOTTOM).setTilt(0f)
+            }
+
+            4 -> {
+                // Spotlight
+                toast = Toast.makeText(context, "Spotlight", Toast.LENGTH_SHORT)
+                shimmerBuilder
+                    .setBaseAlpha(0f)
+                    .setDuration(2000L)
+                    .setDropoff(0.1f)
+                    .setIntensity(0.35f)
+                    .setShape(Shimmer.Shape.RADIAL)
+            }
+
+            5 -> {
+                // Spotlight angle 45
+                toast = Toast.makeText(context, "Spotlight angle 45", Toast.LENGTH_SHORT)
+                shimmerBuilder
+                    .setBaseAlpha(0f)
+                    .setDuration(2000L)
+                    .setDropoff(0.1f)
+                    .setIntensity(0.35f)
+                    .setTilt(45f)
+                    .setShape(Shimmer.Shape.RADIAL)
+            }
+
+            6 -> {
+                // Off
+                toast = Toast.makeText(context, "Off", Toast.LENGTH_SHORT)
+                null
+            }
+
+            else -> {
+                toast = Toast.makeText(context, "Default", Toast.LENGTH_SHORT)
+                shimmerBuilder
+            }
+        }
+            ?.build()
+
+        if (showToast) {
+            toast?.show()
+        }
+    }
+}
+
+private val MainBinding.presetButtons
+    get() = arrayOf(
+        presetButton0,
+        presetButton1,
+        presetButton2,
+        presetButton3,
+        presetButton4,
+        presetButton5,
+        presetButton6,
+    )
diff --git a/sample/src/main/res/layout/main.xml b/sample/src/main/res/layout/main.xml
index caee412..7ae9aae 100755
--- a/sample/src/main/res/layout/main.xml
+++ b/sample/src/main/res/layout/main.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:background="@drawable/background"
-  android:padding="20dp">
+  android:padding="20dp"
+  >
 
   <com.facebook.shimmer.ShimmerFrameLayout
     android:id="@+id/shimmer_view_container"
@@ -15,18 +17,21 @@
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     app:layout_constraintVertical_bias="0.5"
-    app:shimmer_duration="1000">
+    app:shimmer_duration="1000"
+    >
 
     <LinearLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:gravity="center"
-      android:orientation="vertical">
+      android:orientation="vertical"
+      >
 
       <ImageView
         android:layout_width="64dp"
         android:layout_height="64dp"
-        android:src="@drawable/fb_logo" />
+        android:src="@drawable/fb_logo"
+        />
 
       <TextView
         style="@style/thin.white.large"
@@ -34,7 +39,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:gravity="center"
-        android:text="@string/mission_statement" />
+        android:text="@string/mission_statement"
+        />
     </LinearLayout>
   </com.facebook.shimmer.ShimmerFrameLayout>
 
@@ -44,13 +50,13 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginEnd="20dp"
-    android:layout_marginRight="20dp"
     android:text="@string/presets"
     android:textAllCaps="true"
     app:layout_constraintBottom_toBottomOf="@id/preset_scroll_view"
     app:layout_constraintEnd_toStartOf="@id/preset_scroll_view"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="@id/preset_scroll_view" />
+    app:layout_constraintTop_toTopOf="@id/preset_scroll_view"
+    />
 
   <HorizontalScrollView
     android:id="@+id/preset_scroll_view"
@@ -60,7 +66,8 @@
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toEndOf="@id/preset"
-    app:layout_constraintTop_toBottomOf="@id/shimmer_view_container">
+    app:layout_constraintTop_toBottomOf="@id/shimmer_view_container"
+    >
 
     <LinearLayout
       android:id="@+id/settings_container"
@@ -68,49 +75,57 @@
       android:layout_height="wrap_content"
       android:layout_gravity="bottom"
       android:gravity="center_vertical"
-      android:orientation="horizontal">
+      android:orientation="horizontal"
+      >
 
       <Button
         android:id="@+id/preset_button0"
         style="@style/thin.white.small.button"
         android:gravity="center"
-        android:text="1" />
+        android:text="1"
+        />
 
       <Button
         android:id="@+id/preset_button1"
         style="@style/thin.white.small.button"
         android:gravity="center"
-        android:text="2" />
+        android:text="2"
+        />
 
       <Button
         android:id="@+id/preset_button2"
         style="@style/thin.white.small.button"
         android:gravity="center"
-        android:text="3" />
+        android:text="3"
+        />
 
       <Button
         android:id="@+id/preset_button3"
         style="@style/thin.white.small.button"
         android:gravity="center"
-        android:text="4" />
+        android:text="4"
+        />
 
       <Button
         android:id="@+id/preset_button4"
         style="@style/thin.white.small.button"
         android:gravity="center"
-        android:text="5" />
+        android:text="5"
+        />
 
       <Button
         android:id="@+id/preset_button5"
         style="@style/thin.white.small.button"
         android:gravity="center"
-        android:text="6" />
+        android:text="6"
+        />
 
       <Button
         android:id="@+id/preset_button6"
         style="@style/thin.white.small.button"
         android:gravity="center"
-        android:text="Off" />
+        android:text="Off"
+        />
     </LinearLayout>
   </HorizontalScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/shimmer-android-core/build.gradle b/shimmer-android-core/build.gradle
index 7086ec1..69261d1 100755
--- a/shimmer-android-core/build.gradle
+++ b/shimmer-android-core/build.gradle
@@ -10,9 +10,6 @@ android {
   publishing {
     singleVariant("release")
   }
-  packagingOptions {
-    exclude 'LICENSE.txt'
-  }
   lint {
     disable("UnknownNullness")
   }
diff --git a/shimmer-android-core/src/main/java/com/facebook/shimmer/ShimmerDrawable.java b/shimmer-android-core/src/main/java/com/facebook/shimmer/ShimmerDrawable.java
index 81048b5..d9940b7 100644
--- a/shimmer-android-core/src/main/java/com/facebook/shimmer/ShimmerDrawable.java
+++ b/shimmer-android-core/src/main/java/com/facebook/shimmer/ShimmerDrawable.java
@@ -6,6 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
 package com.facebook.shimmer;
 
 import android.animation.ValueAnimator;
@@ -22,231 +23,234 @@
 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 ValueAnimator.AnimatorUpdateListener mUpdateListener = 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 float mStaticAnimationProgress = -1f;
+
+    private @Nullable Shimmer mShimmer;
+
+    public ShimmerDrawable() {
+        mShimmerPaint.setAntiAlias(true);
+    }
+
+    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();
+    }
+
+    public @Nullable Shimmer getShimmer() {
+        return mShimmer;
+    }
+
+    /**
+     * Starts the shimmer animation.
+     */
+    public void startShimmer() {
+        if (mValueAnimator != null && !isShimmerStarted() && getCallback() != null) {
+            mValueAnimator.start();
+        }
+    }
+
+    /**
+     * Stops the shimmer animation.
+     */
+    public void stopShimmer() {
+        if (mValueAnimator != null && isShimmerStarted()) {
+            mValueAnimator.cancel();
+        }
+    }
+
+    /**
+     * Return whether the shimmer animation has been started.
+     */
+    public boolean isShimmerStarted() {
+        return mValueAnimator != null && mValueAnimator.isStarted();
+    }
+
+    /**
+     * Return whether the shimmer animation is running.
+     */
+    public boolean isShimmerRunning() {
+        return mValueAnimator != null && mValueAnimator.isRunning();
+    }
+
+    @Override
+    public void onBoundsChange(Rect bounds) {
+        super.onBoundsChange(bounds);
+        mDrawRect.set(bounds);
+        updateShader();
+        maybeStartShimmer();
+    }
+
+    public void setStaticAnimationProgress(float value) {
+        if (Float.compare(value, mStaticAnimationProgress) == 0
+            || (value < 0f && mStaticAnimationProgress < 0f)) {
+            return;
+        }
+        mStaticAnimationProgress = Math.min(value, 1f);
+        invalidateSelf();
+    }
+
+    public void clearStaticAnimationProgress() {
+        setStaticAnimationProgress(-1f);
+    }
+
+    @Override
+    public void draw(@NonNull Canvas canvas) {
+        if (mShimmer == null || mShimmerPaint.getShader() == null) {
+            return;
         }
-      };
-
-  private final Paint mShimmerPaint = new Paint();
-  private final Rect mDrawRect = new Rect();
-  private final Matrix mShaderMatrix = new Matrix();
-
-  private @Nullable ValueAnimator mValueAnimator;
-  private float mStaticAnimationProgress = -1f;
-
-  private @Nullable Shimmer mShimmer;
-
-  public ShimmerDrawable() {
-    mShimmerPaint.setAntiAlias(true);
-  }
-
-  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();
-  }
-
-  public @Nullable Shimmer getShimmer() {
-    return mShimmer;
-  }
-
-  /** Starts the shimmer animation. */
-  public void startShimmer() {
-    if (mValueAnimator != null && !isShimmerStarted() && getCallback() != null) {
-      mValueAnimator.start();
-    }
-  }
-
-  /** Stops the shimmer animation. */
-  public void stopShimmer() {
-    if (mValueAnimator != null && isShimmerStarted()) {
-      mValueAnimator.cancel();
-    }
-  }
-
-  /** Return whether the shimmer animation has been started. */
-  public boolean isShimmerStarted() {
-    return mValueAnimator != null && mValueAnimator.isStarted();
-  }
-
-  /** Return whether the shimmer animation is running. */
-  public boolean isShimmerRunning() {
-    return mValueAnimator != null && mValueAnimator.isRunning();
-  }
-
-  @Override
-  public void onBoundsChange(Rect bounds) {
-    super.onBoundsChange(bounds);
-    mDrawRect.set(bounds);
-    updateShader();
-    maybeStartShimmer();
-  }
-
-  public void setStaticAnimationProgress(float value) {
-    if (Float.compare(value, mStaticAnimationProgress) == 0
-        || (value < 0f && mStaticAnimationProgress < 0f)) {
-      return;
-    }
-    mStaticAnimationProgress = Math.min(value, 1f);
-    invalidateSelf();
-  }
-
-  public void clearStaticAnimationProgress() {
-    setStaticAnimationProgress(-1f);
-  }
-
-  @Override
-  public void draw(@NonNull Canvas canvas) {
-    if (mShimmer == null || mShimmerPaint.getShader() == 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;
-
-    if (mStaticAnimationProgress < 0f) {
-      animatedValue = mValueAnimator != null ? (float) mValueAnimator.getAnimatedValue() : 0f;
-    } else {
-      animatedValue = mStaticAnimationProgress;
-    }
-
-    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;
-    }
-
-    mShaderMatrix.reset();
-    mShaderMatrix.setRotate(mShimmer.tilt, mDrawRect.width() / 2f, mDrawRect.height() / 2f);
-    mShaderMatrix.preTranslate(dx, dy);
-    mShimmerPaint.getShader().setLocalMatrix(mShaderMatrix);
-    canvas.drawRect(mDrawRect, mShimmerPaint);
-  }
-
-  @Override
-  public void setAlpha(int alpha) {
-    // No-op, modify the Shimmer object you pass in instead
-  }
-
-  @Override
-  public void setColorFilter(@Nullable 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;
-  }
-
-  private float offset(float start, float end, float percent) {
-    return start + (end - start) * percent;
-  }
-
-  private void updateValueAnimator() {
-    if (mShimmer == null) {
-      return;
-    }
-
-    final boolean started;
-    if (mValueAnimator != null) {
-      started = mValueAnimator.isStarted();
-      mValueAnimator.cancel();
-      mValueAnimator.removeAllUpdateListeners();
-    } else {
-      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);
-    if (started) {
-      mValueAnimator.start();
-    }
-  }
-
-  void maybeStartShimmer() {
-    if (mValueAnimator != null
-        && !mValueAnimator.isStarted()
-        && mShimmer != null
-        && mShimmer.autoStart
-        && getCallback() != null) {
-      mValueAnimator.start();
-    }
-  }
-
-  private void updateShader() {
-    final Rect bounds = getBounds();
-    final int boundsWidth = bounds.width();
-    final int boundsHeight = bounds.height();
-    if (boundsWidth == 0 || boundsHeight == 0 || mShimmer == null) {
-      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;
-    }
-
-    mShimmerPaint.setShader(shader);
-  }
+
+        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;
+
+        if (mStaticAnimationProgress < 0f) {
+            animatedValue = mValueAnimator != null ? (float) mValueAnimator.getAnimatedValue() : 0f;
+        } else {
+            animatedValue = mStaticAnimationProgress;
+        }
+
+        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;
+        }
+
+        mShaderMatrix.reset();
+        mShaderMatrix.setRotate(mShimmer.tilt, mDrawRect.width() / 2f, mDrawRect.height() / 2f);
+        mShaderMatrix.preTranslate(dx, dy);
+        mShimmerPaint.getShader().setLocalMatrix(mShaderMatrix);
+        canvas.drawRect(mDrawRect, mShimmerPaint);
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        // No-op, modify the Shimmer object you pass in instead
+    }
+
+    @Override
+    public void setColorFilter(@Nullable 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;
+    }
+
+    private float offset(float start, float end, float percent) {
+        return start + (end - start) * percent;
+    }
+
+    private void updateValueAnimator() {
+        if (mShimmer == null) {
+            return;
+        }
+
+        final boolean started;
+        if (mValueAnimator != null) {
+            started = mValueAnimator.isStarted();
+            mValueAnimator.cancel();
+            mValueAnimator.removeAllUpdateListeners();
+        } else {
+            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);
+        if (started) {
+            mValueAnimator.start();
+        }
+    }
+
+    void maybeStartShimmer() {
+        if (mValueAnimator != null
+            && !mValueAnimator.isStarted()
+            && mShimmer != null
+            && mShimmer.autoStart
+            && getCallback() != null) {
+            mValueAnimator.start();
+        }
+    }
+
+    private void updateShader() {
+        final Rect bounds = getBounds();
+        final int boundsWidth = bounds.width();
+        final int boundsHeight = bounds.height();
+        if (boundsWidth == 0 || boundsHeight == 0 || mShimmer == null) {
+            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;
+        }
+
+        mShimmerPaint.setShader(shader);
+    }
 }