aws-samples · egorbunovs · Mar 17, 2025 · Mar 21, 2025 · Mar 26, 2025
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,22 +1,23 @@
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("kotlin-kapt")
-    id("kotlinx-serialization")
-    id("dagger.hilt.android.plugin")
-    id("com.google.devtools.ksp") version "1.9.0-1.0.13"
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.hilt)
+    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.kotlin.kapt)
 }
 
 android {
-    compileSdk = 34
     namespace = "com.amazon.ivs.livetovod"
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.amazon.ivs.livetovod"
-        minSdk = 26
-        targetSdk = 34
+        minSdk = 23
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
+
         buildConfigField("String", "STREAM_VOD_URL", "\"https://d328da4i6b8le0.cloudfront.net\"")
     }
 
@@ -26,59 +27,53 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
+
     buildFeatures {
-        buildConfig = true
         viewBinding = true
         dataBinding = true
+        buildConfig = true
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlinOptions {
         jvmTarget = "17"
     }
-    java {
-        toolchain {
-            languageVersion.set(JavaLanguageVersion.of("17"))
-        }
-    }
 }
 
 dependencies {
     // Android
-    implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.9.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha12")
-    implementation("androidx.activity:activity-ktx:1.7.2")
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.material)
+    implementation(libs.androidx.fragment.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.exifinterface)
 
     // Navigation
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.3")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.3")
-
-    // Serialization
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
+    implementation(libs.androidx.navigation.fragment.ktx)
+    implementation(libs.androidx.navigation.ui.ktx)
 
-    // Coroutines
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
-
-    // Timber
-    implementation("com.jakewharton.timber:timber:5.0.1")
+    // Kotlin
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.kotlinx.coroutines.android)
+    implementation(libs.kotlinx.coroutines.core)
 
     // Hilt
-    implementation("com.google.dagger:hilt-android:2.48")
-    kapt("androidx.hilt:hilt-compiler:1.0.0")
-    kapt("com.google.dagger:hilt-compiler:2.48")
+    implementation(libs.hilt.android)
+    ksp(libs.hilt.compiler)
 
     // Retrofit
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
-    implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.9")
+    implementation(libs.okhttp)
+    implementation(libs.converter.gson)
+    implementation(libs.logging.interceptor)
 
-    // DataStore
-    implementation("androidx.datastore:datastore:1.0.0")
+    // Timber
+    implementation(libs.timber)
 
     // Amazon IVS
-    implementation("com.amazonaws:ivs-player:1.22.0")
+    implementation(libs.ivs.player)
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,12 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-        android:name=".App"
-        android:allowBackup="false"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:name=".App"
         android:theme="@style/Theme.LiveToVod">
 
         <activity

diff --git a/app/src/main/java/com/amazon/ivs/livetovod/common/ViewExtensions.kt b/app/src/main/java/com/amazon/ivs/livetovod/common/ViewExtensions.kt
@@ -12,26 +12,27 @@ import android.widget.FrameLayout
 import android.widget.SeekBar
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.doOnLayout
+import androidx.core.view.isGone
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
 import com.amazon.ivs.livetovod.models.SizeModel
 import com.amazon.ivs.livetovod.ui.SEEKBAR_MAX_PROGRESS
 import com.google.android.material.snackbar.Snackbar
+import java.util.Locale
 import kotlin.math.roundToInt
 
 const val ALPHA_VISIBLE = 1F
 const val ALPHA_GONE = 0F
 
-fun View.animateVisibility(isVisible: Boolean) {
-    if ((visibility == View.VISIBLE && isVisible)
-        || (visibility == View.GONE && !isVisible)
-        || (visibility == View.INVISIBLE && !isVisible)
-    ) return
+fun View.animateVisibility(visible: Boolean) {
+    if ((isVisible && visible) || (isGone && !visible) || (isInvisible && !visible)) return
     setVisible(true)
-    alpha = if (isVisible) ALPHA_GONE else ALPHA_VISIBLE
-    animate().setDuration(250L).alpha(if (isVisible) ALPHA_VISIBLE else ALPHA_GONE)
+    alpha = if (visible) ALPHA_GONE else ALPHA_VISIBLE
+    animate().setDuration(250L).alpha(if (visible) ALPHA_VISIBLE else ALPHA_GONE)
         .setListener(object : AnimatorListenerAdapter() {
             override fun onAnimationEnd(animation: Animator) {
                 super.onAnimationEnd(animation)
-                setVisible(isVisible, View.INVISIBLE)
+                setVisible(visible, View.INVISIBLE)
             }
         }).start()
 }
@@ -140,13 +141,13 @@ fun Long.toFormattedTime(): String {
         this in hour until tenHours -> {
             val hours: Long = this / (1000 * 60 * 60)
             val leftover = this - hours * 1000 * 60 * 60
-            stringBuffer.append(String.format("%01d", hours)).append(":")
+            stringBuffer.append(formatLocalized("%01d", hours)).append(":")
             stringBuffer.append(leftover.getMinutesAndSeconds())
         }
         this >= tenHours -> {
             val hours: Long = this / (1000 * 60 * 60)
             val leftover = this - hours * 1000 * 60 * 60
-            stringBuffer.append(String.format("%02d", hours)).append(":")
+            stringBuffer.append(formatLocalized("%02d", hours)).append(":")
             stringBuffer.append(leftover.getMinutesAndSeconds())
         }
     }
@@ -157,8 +158,8 @@ fun Long.getMinutesAndSeconds(minutesFormat: String = "%02d"): String {
     val stringBuffer = StringBuffer()
     val minutes = this / (1000 * 60)
     val seconds = this / 1000 - minutes * 60
-    stringBuffer.append(String.format(minutesFormat, minutes)).append(":")
-    stringBuffer.append(String.format("%02d", seconds))
+    stringBuffer.append(formatLocalized(minutesFormat, minutes)).append(":")
+    stringBuffer.append(formatLocalized("%02d", seconds))
     return stringBuffer.toString()
 }
 
@@ -188,3 +189,5 @@ fun View.setXIfNotOutOfBounds(thumbXCenter: Float, screenWidth: Int, progress: I
         }
     }
 }
+
+private fun formatLocalized(format: String, vararg args: Any) = String.format(Locale.getDefault(), format, *args)
diff --git a/app/src/main/java/com/amazon/ivs/livetovod/ui/MainViewModel.kt b/app/src/main/java/com/amazon/ivs/livetovod/ui/MainViewModel.kt
@@ -1,8 +1,8 @@
 package com.amazon.ivs.livetovod.ui
 
-import android.net.Uri
 import android.view.Surface
 import android.view.TextureView
+import androidx.core.net.toUri
 import androidx.lifecycle.ViewModel
 import com.amazon.ivs.livetovod.BuildConfig
 import com.amazon.ivs.livetovod.common.countDownTimer
@@ -175,7 +175,7 @@ class MainViewModel @Inject constructor(private val repository: Repository) : Vi
             return
         }
         _onStreamLoading.trySend(true)
-        livePlayer = MediaPlayer(textureView.context)
+        livePlayer = MediaPlayer.Builder(textureView.context).build()
         livePlayerListener = initPlayer(
             livePlayer!!,
             textureView,
@@ -199,7 +199,7 @@ class MainViewModel @Inject constructor(private val repository: Repository) : Vi
         _onStreamLoading.trySend(true)
 
         Timber.d("Initializing VOD player")
-        vodPlayer = MediaPlayer(textureView.context)
+        vodPlayer = MediaPlayer.Builder(textureView.context).build()
         vodPlayerListener = initPlayer(
             vodPlayer!!,
             textureView,
@@ -270,7 +270,7 @@ class MainViewModel @Inject constructor(private val repository: Repository) : Vi
             }
         )
         player.setSurface(Surface(textureView.surfaceTexture))
-        player.load(Uri.parse(uri))
+        player.load(uri.toUri())
         return listener
     }
 

diff --git a/app/src/main/res/drawable/ic_backward.xml b/app/src/main/res/drawable/ic_backward.xml
@@ -5,12 +5,12 @@
     android:viewportHeight="44">
   <path
       android:pathData="M21.6875,12.313V10.06C21.6875,9.6374 21.1956,9.4054 20.8695,9.6742L16.4672,13.3026C16.2245,13.5026 16.2245,13.8743 16.4672,14.0743L20.8695,17.7027C21.1956,17.9716 21.6875,17.7396 21.6875,17.3169V14.3133C26.8477,14.4132 31,18.6275 31,23.8115C31,29.0582 26.7467,33.3115 21.5,33.3115C16.2533,33.3115 12,29.0582 12,23.8115C12,23.2592 11.5523,22.8115 11,22.8115C10.4477,22.8115 10,23.2592 10,23.8115C10,30.1628 15.1487,35.3115 21.5,35.3115C27.8513,35.3115 33,30.1628 33,23.8115C33,17.5229 27.9523,12.4132 21.6875,12.313Z"
-      android:fillColor="@color/forward_backward_button_color"
-      android:fillType="evenOdd"/>
+      android:fillColor="#FFFFFF"
+      android:fillType="evenOdd" />
   <path
       android:pathData="M17.7683,28.1094C17.3569,28.1068 16.9597,28.0378 16.5769,27.9023C16.1967,27.7669 15.8556,27.5469 15.5535,27.2422C15.2514,26.9375 15.0118,26.5339 14.8347,26.0312C14.6602,25.5286 14.573,24.9115 14.573,24.1797C14.5756,23.5078 14.6524,22.9076 14.8035,22.3789C14.9571,21.8477 15.1759,21.3971 15.4597,21.0273C15.7462,20.6576 16.0886,20.3763 16.4871,20.1836C16.8855,19.9883 17.3321,19.8906 17.8269,19.8906C18.3608,19.8906 18.8321,19.9948 19.241,20.2031C19.6498,20.4089 19.9779,20.6888 20.2253,21.043C20.4753,21.3971 20.6264,21.7943 20.6785,22.2344H19.0105C18.9454,21.9557 18.8087,21.737 18.6003,21.5781C18.392,21.4193 18.1342,21.3398 17.8269,21.3398C17.3061,21.3398 16.9102,21.5664 16.6394,22.0195C16.3712,22.4727 16.2345,23.0885 16.2292,23.8672H16.2839C16.4037,23.6302 16.5652,23.4284 16.7683,23.2617C16.974,23.0924 17.2071,22.9635 17.4675,22.875C17.7306,22.7839 18.0079,22.7383 18.2996,22.7383C18.7735,22.7383 19.1954,22.8503 19.5652,23.0742C19.935,23.2956 20.2266,23.6003 20.4402,23.9883C20.6537,24.3763 20.7605,24.8203 20.7605,25.3203C20.7605,25.862 20.6342,26.3438 20.3816,26.7656C20.1316,27.1875 19.7813,27.5182 19.3308,27.7578C18.8829,27.9948 18.3621,28.112 17.7683,28.1094ZM17.7605,26.7812C18.0209,26.7812 18.254,26.7188 18.4597,26.5938C18.6654,26.4688 18.8269,26.2995 18.9441,26.0859C19.0613,25.8724 19.1199,25.6328 19.1199,25.3672C19.1199,25.1016 19.0613,24.8633 18.9441,24.6523C18.8295,24.4414 18.6707,24.2734 18.4675,24.1484C18.2644,24.0234 18.0326,23.9609 17.7722,23.9609C17.5769,23.9609 17.3959,23.9974 17.2292,24.0703C17.0652,24.1432 16.9207,24.2448 16.7957,24.375C16.6733,24.5052 16.5769,24.6562 16.5066,24.8281C16.4363,24.9974 16.4011,25.1784 16.4011,25.3711C16.4011,25.6289 16.4597,25.8646 16.5769,26.0781C16.6967,26.2917 16.8582,26.4622 17.0613,26.5898C17.267,26.7174 17.5001,26.7812 17.7605,26.7812Z"
-      android:fillColor="@color/forward_backward_button_color"/>
+      android:fillColor="#FFFFFF" />
   <path
       android:pathData="M25.1624,28.1758C24.4906,28.1732 23.9124,28.0078 23.4281,27.6797C22.9463,27.3516 22.5752,26.8763 22.3148,26.2539C22.057,25.6315 21.9294,24.8828 21.932,24.0078C21.932,23.1354 22.0609,22.3919 22.3187,21.7773C22.5791,21.1628 22.9502,20.6953 23.432,20.375C23.9163,20.0521 24.4932,19.8906 25.1624,19.8906C25.8317,19.8906 26.4072,20.0521 26.889,20.375C27.3734,20.6979 27.7458,21.1667 28.0062,21.7812C28.2666,22.3932 28.3955,23.1354 28.3929,24.0078C28.3929,24.8854 28.2627,25.6354 28.0023,26.2578C27.7445,26.8802 27.3747,27.3555 26.8929,27.6836C26.4111,28.0117 25.8343,28.1758 25.1624,28.1758ZM25.1624,26.7734C25.6208,26.7734 25.9867,26.543 26.2601,26.082C26.5335,25.6211 26.6689,24.9297 26.6663,24.0078C26.6663,23.401 26.6038,22.8958 26.4788,22.4922C26.3564,22.0885 26.182,21.7852 25.9554,21.582C25.7314,21.3789 25.4671,21.2773 25.1624,21.2773C24.7067,21.2773 24.3421,21.5052 24.0687,21.9609C23.7952,22.4167 23.6572,23.099 23.6546,24.0078C23.6546,24.6224 23.7158,25.1354 23.8382,25.5469C23.9632,25.9557 24.139,26.263 24.3656,26.4688C24.5921,26.6719 24.8577,26.7734 25.1624,26.7734Z"
-      android:fillColor="@color/forward_backward_button_color"/>
+      android:fillColor="#FFFFFF" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_forward.xml b/app/src/main/res/drawable/ic_forward.xml
@@ -5,12 +5,12 @@
     android:viewportHeight="44">
   <path
       android:pathData="M21.3125,12.313V10.06C21.3125,9.6374 21.8044,9.4054 22.1305,9.6742L26.5328,13.3026C26.7755,13.5026 26.7755,13.8743 26.5328,14.0743L22.1305,17.7027C21.8044,17.9716 21.3125,17.7396 21.3125,17.3169V14.3133C16.1523,14.4132 12,18.6275 12,23.8115C12,29.0582 16.2533,33.3115 21.5,33.3115C26.7467,33.3115 31,29.0582 31,23.8115C31,23.2592 31.4477,22.8115 32,22.8115C32.5523,22.8115 33,23.2592 33,23.8115C33,30.1628 27.8513,35.3115 21.5,35.3115C15.1487,35.3115 10,30.1628 10,23.8115C10,17.5229 15.0477,12.4132 21.3125,12.313Z"
-      android:fillColor="@color/forward_backward_button_color"
-      android:fillType="evenOdd"/>
+      android:fillColor="#FFFFFF"
+      android:fillType="evenOdd" />
   <path
       android:pathData="M17.7683,28.1094C17.3569,28.1068 16.9597,28.0378 16.5769,27.9023C16.1967,27.7669 15.8556,27.5469 15.5535,27.2422C15.2514,26.9375 15.0118,26.5339 14.8347,26.0312C14.6602,25.5286 14.573,24.9115 14.573,24.1797C14.5756,23.5078 14.6524,22.9076 14.8035,22.3789C14.9571,21.8477 15.1759,21.3971 15.4597,21.0273C15.7462,20.6576 16.0886,20.3763 16.4871,20.1836C16.8855,19.9883 17.3321,19.8906 17.8269,19.8906C18.3608,19.8906 18.8321,19.9948 19.241,20.2031C19.6498,20.4089 19.9779,20.6888 20.2253,21.043C20.4753,21.3971 20.6264,21.7943 20.6785,22.2344H19.0105C18.9454,21.9557 18.8087,21.737 18.6003,21.5781C18.392,21.4193 18.1342,21.3398 17.8269,21.3398C17.3061,21.3398 16.9102,21.5664 16.6394,22.0195C16.3712,22.4727 16.2345,23.0885 16.2292,23.8672H16.2839C16.4037,23.6302 16.5652,23.4284 16.7683,23.2617C16.974,23.0924 17.2071,22.9635 17.4675,22.875C17.7306,22.7839 18.0079,22.7383 18.2996,22.7383C18.7735,22.7383 19.1954,22.8503 19.5652,23.0742C19.935,23.2956 20.2266,23.6003 20.4402,23.9883C20.6537,24.3763 20.7605,24.8203 20.7605,25.3203C20.7605,25.862 20.6342,26.3438 20.3816,26.7656C20.1316,27.1875 19.7813,27.5182 19.3308,27.7578C18.8829,27.9948 18.3621,28.112 17.7683,28.1094ZM17.7605,26.7812C18.0209,26.7812 18.254,26.7188 18.4597,26.5938C18.6654,26.4688 18.8269,26.2995 18.9441,26.0859C19.0613,25.8724 19.1199,25.6328 19.1199,25.3672C19.1199,25.1016 19.0613,24.8633 18.9441,24.6523C18.8295,24.4414 18.6707,24.2734 18.4675,24.1484C18.2644,24.0234 18.0326,23.9609 17.7722,23.9609C17.5769,23.9609 17.3959,23.9974 17.2292,24.0703C17.0652,24.1432 16.9207,24.2448 16.7957,24.375C16.6733,24.5052 16.5769,24.6562 16.5066,24.8281C16.4363,24.9974 16.4011,25.1784 16.4011,25.3711C16.4011,25.6289 16.4597,25.8646 16.5769,26.0781C16.6967,26.2917 16.8582,26.4622 17.0613,26.5898C17.267,26.7174 17.5001,26.7812 17.7605,26.7812Z"
-      android:fillColor="@color/forward_backward_button_color"/>
+      android:fillColor="#FFFFFF" />
   <path
       android:pathData="M25.1624,28.1758C24.4906,28.1732 23.9124,28.0078 23.4281,27.6797C22.9463,27.3516 22.5752,26.8763 22.3148,26.2539C22.057,25.6315 21.9294,24.8828 21.932,24.0078C21.932,23.1354 22.0609,22.3919 22.3187,21.7773C22.5791,21.1628 22.9502,20.6953 23.432,20.375C23.9163,20.0521 24.4932,19.8906 25.1624,19.8906C25.8317,19.8906 26.4072,20.0521 26.889,20.375C27.3734,20.6979 27.7458,21.1667 28.0062,21.7812C28.2666,22.3932 28.3955,23.1354 28.3929,24.0078C28.3929,24.8854 28.2627,25.6354 28.0023,26.2578C27.7445,26.8802 27.3747,27.3555 26.8929,27.6836C26.4111,28.0117 25.8343,28.1758 25.1624,28.1758ZM25.1624,26.7734C25.6208,26.7734 25.9867,26.543 26.2601,26.082C26.5335,25.6211 26.6689,24.9297 26.6663,24.0078C26.6663,23.401 26.6038,22.8958 26.4788,22.4922C26.3564,22.0885 26.182,21.7852 25.9554,21.582C25.7314,21.3789 25.4671,21.2773 25.1624,21.2773C24.7067,21.2773 24.3421,21.5052 24.0687,21.9609C23.7952,22.4167 23.6572,23.099 23.6546,24.0078C23.6546,24.6224 23.7158,25.1354 23.8382,25.5469C23.9632,25.9557 24.139,26.263 24.3656,26.4688C24.5921,26.6719 24.8577,26.7734 25.1624,26.7734Z"
-      android:fillColor="@color/forward_backward_button_color"/>
+      android:fillColor="#FFFFFF" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_live.xml b/app/src/main/res/drawable/ic_live.xml
@@ -7,7 +7,6 @@
         <clip-path android:pathData="M0,0h19.5003v14.5h-19.5003z" />
         <group>
             <clip-path
-                android:fillType="evenOdd"
                 android:pathData="M7.5,6L0,0V14.5L7.5,8.5V6ZM12.0003,8.5L19.5003,14.5L19.5003,0L12.0003,6V8.5Z" />
             <path
                 android:fillColor="#00000000"

diff --git a/...rc/main/res/mipmap-anydpi/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml b/...rc/main/res/mipmap-anydpi/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/...n/res/mipmap-anydpi/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml b/...n/res/mipmap-anydpi/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -6,11 +6,9 @@
     <color name="button_accent_color">#e1e1e1</color>
     <color name="primary_red_color">#FF0000</color>
     <color name="text_color">#FFF</color>
-    <color name="forward_backward_button_color">#FFF</color>
     <color name="seekbar_thumb_color">#FFF</color>
     <color name="pill_live">#FF0000</color>
     <color name="pill_vod">#FFE76A</color>
-    <color name="ic_launcher_background">#21242A</color>
 
     <color name="buffering_color_end">#CDCDCD</color>
     <color name="buffering_color_center">#E6E6E6</color>
@@ -23,4 +21,4 @@
     <color name="controls_gradient_end">#00000000</color>
     <color name="back_to_live_background_color">#B3000000</color>
 
-</resources>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -2,16 +2,11 @@
     <dimen name="margin_huge">36dp</dimen>
     <dimen name="margin_normal">16dp</dimen>
     <dimen name="margin_medium">12dp</dimen>
-    <dimen name="margin_small">8dp</dimen>
     <dimen name="margin_tiny">4dp</dimen>
 
-    <dimen name="padding_large">20dp</dimen>
-    <dimen name="padding_normal">16dp</dimen>
-    <dimen name="padding_medium">12dp</dimen>
     <dimen name="padding_small">8dp</dimen>
     <dimen name="padding_tiny">4dp</dimen>
 
-    <dimen name="player_control_height">160dp</dimen>
     <dimen name="play_pause_button_size">48dp</dimen>
     <dimen name="forward_backward_button_size">48dp</dimen>
     <dimen name="forward_backward_button_padding">4dp</dimen>
@@ -21,4 +16,4 @@
     <dimen name="corner_radius_big">16dp</dimen>
     <dimen name="corner_radius_normal">8dp</dimen>
 
-</resources>
+</resources>
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>