Upgraded to Compose alpha 7
diff --git a/build.gradle b/build.gradle
index c4380b9..aee62c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
buildscript {
ext {
- composeVersion = '1.0.0-alpha06'
+ composeVersion = '1.0.0-alpha07'
kotlinVersion = '1.4.10'
daggerVersion = '2.29.1'
}
diff --git a/lottie-compose/gradle.properties b/lottie-compose/gradle.properties
index 9e4a2e6..75bbfc5 100644
--- a/lottie-compose/gradle.properties
+++ b/lottie-compose/gradle.properties
@@ -2,4 +2,4 @@
POM_ARTIFACT_ID=lottie-compose
POM_PACKAGING=aar
GROUP=com.airbnb.android
-VERSION_NAME=1.0.0-alpha01
\ No newline at end of file
+VERSION_NAME=1.0.0-alpha02-SNAPSHOT
\ No newline at end of file
diff --git a/sample-compose/build.gradle b/sample-compose/build.gradle
index 2374a1a..e147a92 100644
--- a/sample-compose/build.gradle
+++ b/sample-compose/build.gradle
@@ -64,15 +64,15 @@
implementation "androidx.compose.material:material:$composeVersion"
implementation "androidx.compose.material:material-icons-extended:$composeVersion"
implementation "androidx.ui:ui-tooling:$composeVersion"
- implementation "androidx.navigation:navigation-compose:1.0.0-alpha01"
+ implementation "androidx.navigation:navigation-compose:1.0.0-alpha02"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-beta01'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-beta01'
implementation "androidx.navigation:navigation-fragment-ktx:2.3.1"
implementation "androidx.navigation:navigation-ui-ktx:2.3.1"
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.0'
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0'
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1'
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
implementation "com.google.dagger:dagger:$daggerVersion"
kapt "com.google.dagger:dagger-compiler:$daggerVersion"
@@ -82,7 +82,7 @@
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
- implementation "dev.chrisbanes.accompanist:accompanist-coil:0.3.1"
+ implementation "dev.chrisbanes.accompanist:accompanist-coil:0.3.3.1"
implementation 'com.airbnb.android:mvrx:2.0.0-beta2'
testImplementation 'junit:junit:4.13.1'
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/ComposeActivity.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/ComposeActivity.kt
index 5db00fb..2bbe0b3 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/ComposeActivity.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/ComposeActivity.kt
@@ -5,13 +5,13 @@
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding
import androidx.compose.material.BottomNavigation
import androidx.compose.material.BottomNavigationItem
import androidx.compose.material.Icon
import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Providers
import androidx.compose.runtime.getValue
@@ -37,7 +37,6 @@
import com.airbnb.lottie.sample.compose.ui.Teal
import com.airbnb.lottie.sample.compose.ui.toColorSafe
import com.airbnb.lottie.sample.compose.utils.NavControllerAmbient
-import com.airbnb.lottie.sample.compose.utils.drawTopBorder
import com.airbnb.lottie.sample.compose.utils.getBase64String
class ComposeActivity : AppCompatActivity() {
@@ -120,6 +119,6 @@
Showcase(Route.Showcase, R.drawable.ic_showcase, R.string.bottom_tab_showcase),
Preview(Route.Preview, R.drawable.ic_device, R.string.bottom_tab_preview),
LottieFiles(Route.LottieFiles, R.drawable.ic_lottie_files, R.string.bottom_tab_lottie_files),
- Learn(Route.Learn, R.drawable.ic_learn, R.string.bottom_tab_lottie_files),
+ Docs(Route.Learn, R.drawable.ic_docs, R.string.bottom_tab_docs),
}
}
\ No newline at end of file
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/Route.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/Route.kt
index 68212c5..80de589 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/Route.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/Route.kt
@@ -3,7 +3,6 @@
import android.util.Base64
import androidx.navigation.compose.NamedNavArgument
import androidx.navigation.compose.navArgument
-import java.net.URLEncoder
sealed class Route(val route: String, val args: List<NamedNavArgument> = emptyList()) {
object Showcase : Route("showcase")
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/api/AnimationDataV1.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/api/AnimationDataV1.kt
index 5030055..7f86dbd 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/api/AnimationDataV1.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/api/AnimationDataV1.kt
@@ -1,15 +1,9 @@
package com.airbnb.lottie.sample.compose.api
-import android.os.Parcelable
-import com.airbnb.lottie.sample.compose.ui.toColorSafe
-import kotlinx.android.parcel.Parcelize
-
data class AnimationDataV1(
val id: Int,
val bg_color: String?,
val preview: String?,
val title: String,
val lottie_link: String
-) {
- val bgColor get() = bg_color.toColorSafe()
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/api/AnimationDataV2.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/api/AnimationDataV2.kt
index 7e1dbe0..d440dc3 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/api/AnimationDataV2.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/api/AnimationDataV2.kt
@@ -1,10 +1,6 @@
package com.airbnb.lottie.sample.compose.api
-import android.os.Parcelable
import com.airbnb.lottie.sample.compose.ui.toColorSafe
-import com.squareup.moshi.Json
-import kotlinx.android.parcel.IgnoredOnParcel
-import kotlinx.android.parcel.Parcelize
data class AnimationDataV2(
val id: Int,
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/AnimationRow.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/AnimationRow.kt
index 2fd3bb6..e10f8d0 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/AnimationRow.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/AnimationRow.kt
@@ -1,6 +1,5 @@
package com.airbnb.lottie.sample.compose.composables
-import androidx.compose.foundation.Text
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Row
@@ -8,6 +7,7 @@
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.material.Surface
+import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -15,7 +15,6 @@
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import com.airbnb.lottie.sample.compose.utils.drawTopBorder
import dev.chrisbanes.accompanist.coil.CoilImage
@Composable
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/Marquee.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/Marquee.kt
index 0cc9957..6240c68 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/Marquee.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/Marquee.kt
@@ -1,7 +1,7 @@
package com.airbnb.lottie.sample.compose.composables
-import androidx.compose.foundation.Text
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.text.font.FontWeight
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/SeekBar.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/SeekBar.kt
index e5d797c..8e0f772 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/SeekBar.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/SeekBar.kt
@@ -13,7 +13,7 @@
import androidx.compose.ui.gesture.DragObserver
import androidx.compose.ui.gesture.dragGestureFilter
import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.onGloballyPositioned
+import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.ui.tooling.preview.Preview
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/dagger/ApplicationComponent.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/dagger/ApplicationComponent.kt
index 3607b1e..ec2b36d 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/dagger/ApplicationComponent.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/dagger/ApplicationComponent.kt
@@ -1,7 +1,6 @@
package com.airbnb.lottie.sample.compose.dagger
import com.airbnb.lottie.sample.compose.api.ApiModule
-import com.airbnb.lottie.sample.compose.showcase.ShowcaseViewModel
import com.airbnb.mvrx.MavericksViewModel
import dagger.Component
import javax.inject.Singleton
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/lottiefiles/LottieFilesPage.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/lottiefiles/LottieFilesPage.kt
index f6faeb1..7c0b249 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/lottiefiles/LottieFilesPage.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/lottiefiles/LottieFilesPage.kt
@@ -2,16 +2,16 @@
import androidx.annotation.StringRes
import androidx.compose.animation.animate
-import androidx.compose.foundation.Text
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
import androidx.compose.runtime.*
import androidx.compose.runtime.savedinstancestate.savedInstanceState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.onGloballyPositioned
+import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.DensityAmbient
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/lottiefiles/LottieFilesSearchPage.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/lottiefiles/LottieFilesSearchPage.kt
index 1120a94..ba6ee6c 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/lottiefiles/LottieFilesSearchPage.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/lottiefiles/LottieFilesSearchPage.kt
@@ -1,7 +1,6 @@
package com.airbnb.lottie.sample.compose.lottiefiles
import android.util.Log
-import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
@@ -11,7 +10,7 @@
import androidx.compose.material.Icon
import androidx.compose.material.OutlinedTextField
import androidx.compose.material.Surface
-import androidx.compose.material.TextField
+import androidx.compose.material.Text
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Repeat
import androidx.compose.runtime.Composable
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/PlayerPage.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/PlayerPage.kt
index 3e71a6f..b27fc0f 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/PlayerPage.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/PlayerPage.kt
@@ -1,10 +1,8 @@
package com.airbnb.lottie.sample.compose.player
-import android.os.Build
import androidx.activity.OnBackPressedDispatcher
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.ScrollableRow
-import androidx.compose.foundation.Text
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
@@ -26,6 +24,7 @@
import androidx.compose.material.IconButton
import androidx.compose.material.Scaffold
import androidx.compose.material.Surface
+import androidx.compose.material.Text
import androidx.compose.material.TopAppBar
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Close
@@ -36,7 +35,7 @@
import androidx.compose.material.icons.filled.Warning
import androidx.compose.material.rememberScaffoldState
import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedTask
+import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.Providers
import androidx.compose.runtime.getValue
@@ -97,7 +96,7 @@
val failedMessage = stringResource(R.string.failed_to_load)
val okMessage = stringResource(R.string.ok)
- LaunchedTask(compositionResult) {
+ LaunchedEffect(compositionResult) {
if (compositionResult is LottieCompositionResult.Fail) {
scaffoldState.snackbarHostState.showSnackbar(
message = failedMessage,
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/ToolbarChip.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/ToolbarChip.kt
index 8b302e3..f5a6cd0 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/ToolbarChip.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/ToolbarChip.kt
@@ -1,12 +1,12 @@
package com.airbnb.lottie.sample.compose.player
import androidx.annotation.DrawableRes
-import androidx.compose.foundation.Icon
-import androidx.compose.foundation.Text
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Icon
import androidx.compose.material.Surface
+import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/preview/PreviewPage.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/preview/PreviewPage.kt
index 40b86e1..9ad3f5b 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/preview/PreviewPage.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/preview/PreviewPage.kt
@@ -2,7 +2,6 @@
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
-import androidx.compose.foundation.Text
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
@@ -16,6 +15,7 @@
import androidx.compose.material.Icon
import androidx.compose.material.OutlinedTextField
import androidx.compose.material.Surface
+import androidx.compose.material.Text
import androidx.compose.material.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
@@ -31,7 +31,6 @@
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.window.Dialog
-import androidx.navigation.compose.navArgument
import androidx.ui.tooling.preview.Preview
import com.airbnb.lottie.sample.compose.R
import com.airbnb.lottie.sample.compose.Route
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/ui/Theme.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/ui/Theme.kt
index b6a202b..4bec9b3 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/ui/Theme.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/ui/Theme.kt
@@ -1,8 +1,6 @@
package com.airbnb.lottie.sample.compose.ui
-import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material.MaterialTheme
-import androidx.compose.material.darkColors
import androidx.compose.material.lightColors
import androidx.compose.runtime.Composable
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/utils/ComposeExtensions.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/utils/ComposeExtensions.kt
index 94947c9..901ee58 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/utils/ComposeExtensions.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/utils/ComposeExtensions.kt
@@ -1,25 +1,15 @@
package com.airbnb.lottie.sample.compose.utils
-import androidx.annotation.PluralsRes
import androidx.compose.foundation.background
import androidx.compose.foundation.border
-import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.drawBehind
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.ContextAmbient
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
-@Composable
-fun quantityStringResource(@PluralsRes id: Int, quantity: Int, vararg formatArgs: Any): String {
- val context = ContextAmbient.current
- return context.resources.getQuantityString(id, quantity, *formatArgs)
-}
-
-
fun Modifier.maybeBackground(color: Color?): Modifier {
return if (color == null) {
this
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/utils/NavigationExtensions.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/utils/NavigationExtensions.kt
index e9ef66c..1a83ae0 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/utils/NavigationExtensions.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/utils/NavigationExtensions.kt
@@ -5,7 +5,6 @@
import androidx.compose.runtime.Composable
import androidx.compose.runtime.staticAmbientOf
import androidx.navigation.NavController
-import java.nio.charset.Charset
import java.nio.charset.StandardCharsets
val NavControllerAmbient = staticAmbientOf<NavController> { error("You must specify a NavController.") }
diff --git a/sample-compose/src/main/res/drawable/ic_docs.xml b/sample-compose/src/main/res/drawable/ic_docs.xml
new file mode 100644
index 0000000..252a711
--- /dev/null
+++ b/sample-compose/src/main/res/drawable/ic_docs.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM19,11L9,11L9,9h10v2zM15,15L9,15v-2h6v2zM19,7L9,7L9,5h10v2z"/>
+</vector>
diff --git a/sample-compose/src/main/res/drawable/ic_learn.xml b/sample-compose/src/main/res/drawable/ic_learn.xml
deleted file mode 100644
index bfebdd4..0000000
--- a/sample-compose/src/main/res/drawable/ic_learn.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24"
- android:tint="?attr/colorControlNormal">
- <path
- android:fillColor="@android:color/white"
- android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
-</vector>
diff --git a/sample-compose/src/main/res/raw/circle.json b/sample-compose/src/main/res/raw/circle.json
deleted file mode 100644
index ebfe00d..0000000
--- a/sample-compose/src/main/res/raw/circle.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.7.1","fr":29.9700012207031,"ip":0,"op":59.0000024031193,"w":128,"h":128,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[64,64,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[87.727,87.727],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,0,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[15]},{"t":59.0000024031193,"s":[0]}],"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.863,2.363],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":152.000006191087,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/sample-compose/src/main/res/raw/octagon.json b/sample-compose/src/main/res/raw/octagon.json
deleted file mode 100644
index 7f7ea01..0000000
--- a/sample-compose/src/main/res/raw/octagon.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.7.1","fr":29.9700012207031,"ip":0,"op":900.000036657751,"w":400,"h":400,"nm":"Comp 2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[200,200,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":2,"d":1,"pt":{"a":0,"k":9,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"or":{"a":0,"k":200,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,4],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":900.000036657751,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/sample-compose/src/main/res/values/colors.xml b/sample-compose/src/main/res/values/colors.xml
index b30c688..54853c6 100644
--- a/sample-compose/src/main/res/values/colors.xml
+++ b/sample-compose/src/main/res/values/colors.xml
@@ -15,5 +15,4 @@
<color name="background_color4">#008489</color>
<color name="background_color5">#A61D55</color>
<color name="background_color6">#FFB400</color>
- <color name="background_color7">#A61D55</color>
</resources>
\ No newline at end of file
diff --git a/sample-compose/src/main/res/values/strings.xml b/sample-compose/src/main/res/values/strings.xml
index eedfa5b..46de9bf 100644
--- a/sample-compose/src/main/res/values/strings.xml
+++ b/sample-compose/src/main/res/values/strings.xml
@@ -4,7 +4,7 @@
<string name="bottom_tab_showcase">Showcase</string>
<string name="bottom_tab_preview">Preview</string>
<string name="bottom_tab_lottie_files">LottieFiles</string>
- <string name="bottom_tab_learn">Learn</string>
+ <string name="bottom_tab_docs">Docs</string>
<string name="tab_recent">Recent</string>
<string name="tab_popular">Popular</string>
@@ -17,15 +17,10 @@
<string name="enter_url">Enter a URL to a json or zip file</string>
<string name="load_from_assets">Load from assets</string>
- <plurals name="toolbar_item_warning">
- <item quantity="one">%1$d warning</item>
- <item quantity="other">%1$d warnings</item>
- </plurals>
<string name="toolbar_item_border">Border</string>
<string name="toolbar_item_masks">Outline Masks</string>
<string name="toolbar_item_speed">Speed</string>
<string name="toolbar_item_color">Background</string>
- <string name="toolbar_item_outline_masks">Outline Masks</string>
<string name="toolbar_item_opacity_layers">Apply Opacity To Layers</string>
<string name="failed_to_load">Failed to load composition</string>
diff --git a/sample-compose/src/main/res/values/themes.xml b/sample-compose/src/main/res/values/themes.xml
index a42a0c1..52ab4b0 100644
--- a/sample-compose/src/main/res/values/themes.xml
+++ b/sample-compose/src/main/res/values/themes.xml
@@ -18,8 +18,4 @@
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
-
- <style name="Theme.Lottieandroid.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
- <style name="Theme.Lottieandroid.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
</resources>
\ No newline at end of file
