Merge pull request #285 from team-haribo/develop

🔀 :: (#256) - release 1.2.7
team-haribo · Jul 5, 2024 · 960f45b · 960f45b
2 parents 3721158 + 66245ed
commit 960f45b
Show file tree

Hide file tree

Showing 48 changed files with 442 additions and 121 deletions.
diff --git a/app/src/main/java/com/goms/goms_android_v2/GomsNotification.kt b/app/src/main/java/com/goms/goms_android_v2/GomsNotification.kt
@@ -53,7 +53,7 @@ class GomsNotification : FirebaseMessagingService() {
             setContentTitle(title)
             setContentText(body)
             setPriority(NotificationCompat.PRIORITY_HIGH)
-            setVibrate(longArrayOf(1000, 1000, 1000))
+            setVibrate(longArrayOf(1_000L, 1_000L, 1_000L))
             setContentIntent(pendingIntent)
             setAutoCancel(true)
             setGroup(GROUP_NAME)

diff --git a/app/src/main/java/com/goms/goms_android_v2/MainActivity.kt b/app/src/main/java/com/goms/goms_android_v2/MainActivity.kt
@@ -95,7 +95,7 @@ class MainActivity : ComponentActivity() {
 
     private fun controlTheStackWhenBackPressed() {
         val currentTime = System.currentTimeMillis()
-        if (doubleBackToExitPressedOnce && currentTime - backPressedTimestamp <= 2000) {
+        if (doubleBackToExitPressedOnce && currentTime - backPressedTimestamp <= 2_000L) {
             finishAffinity()
         } else {
             doubleBackToExitPressedOnce = true

diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -21,8 +21,8 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                     applicationId = "com.goms.goms_android_v2"
                     minSdk = 26
                     targetSdk = 34
-                    versionCode = 17
-                    versionName = "1.2.6"
+                    versionCode = 18
+                    versionName = "1.2.7"
                     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
                     vectorDrawables.useSupportLibrary = true

diff --git a/core/design-system/build.gradle.kts b/core/design-system/build.gradle.kts
@@ -27,6 +27,7 @@ dependencies {
     implementation(libs.kotlinx.datetime)
     implementation(libs.kotlinx.immutable)
     implementation(libs.androidx.wear.compose)
+    implementation(libs.lottie.compose)
 }
 
 fun getApiKey(propertyKey: String): String {

diff --git a/...src/main/java/com/goms/design_system/component/bottomsheet/MultipleSelectorBottomSheet.kt b/...src/main/java/com/goms/design_system/component/bottomsheet/MultipleSelectorBottomSheet.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -95,7 +96,12 @@ fun MultipleSelectorBottomSheet(
                 closeSheet = closeSheet
             )
             LazyColumn {
-                itemsIndexed(subTitles) { index, subTitle ->
+                itemsIndexed(
+                    items = subTitles,
+                    key = { index, data ->
+                        data
+                    }
+                ) { index, subTitle ->
                     MultipleSelectorBottomSheetItem(
                         componentWidth = componentWidth,
                         title = subTitle,
@@ -137,13 +143,22 @@ fun MultipleSelectorBottomSheetItem(
         modifier = Modifier.fillMaxWidth(),
         horizontalArrangement = Arrangement.spacedBy(16.dp)
     ) {
-        items(list.size) {
+        items(
+            items = list,
+            key = { data ->
+                data
+            }
+        ) { data ->
             AdminBottomSheetButton(
                 modifier = Modifier.widthIn((componentWidth - 16.dp * (list.size - 1)) / list.size),
-                text = list[it],
-                selected = selectedItem == list[it]
+                text = data,
+                selected = selectedItem == data
             ) {
-                itemChange(list[it])
+                if (selectedItem == data) {
+                    itemChange("")
+                } else {
+                    itemChange(data)
+                }
             }
         }
     }

diff --git a/...n-system/src/main/java/com/goms/design_system/component/bottomsheet/ProfileBottomSheet.kt b/...n-system/src/main/java/com/goms/design_system/component/bottomsheet/ProfileBottomSheet.kt
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Divider
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
 import androidx.compose.material3.rememberDatePickerState
@@ -63,7 +64,7 @@ fun ProfileBottomSheet(
                 content = stringResource(id = R.string.select_gallery),
                 icon = { GalleryIcon(tint = colors.WHITE) }
             )
-            Divider(
+            HorizontalDivider(
                 modifier = Modifier.fillMaxWidth(),
                 color = colors.WHITE.copy(0.15f)
             )

diff --git a/...-system/src/main/java/com/goms/design_system/component/bottomsheet/SelectorBottomSheet.kt b/...-system/src/main/java/com/goms/design_system/component/bottomsheet/SelectorBottomSheet.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ModalBottomSheet
@@ -68,13 +69,18 @@ fun SelectorBottomSheet(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.spacedBy(16.dp)
             ) {
-                items(list.size) {
+                items(
+                    items = list,
+                    key = { data ->
+                        data
+                    }
+                ) { data ->
                     BottomSheetButton(
                         modifier = Modifier.widthIn((componentWidth - 16.dp * list.lastIndex) / list.size),
-                        text = list[it],
-                        selected = selected == list[it]
+                        text = data,
+                        selected = selected == data
                     ) {
-                        itemChange(list[it])
+                        itemChange(data)
                     }
                 }
             }

diff --git a/core/design-system/src/main/java/com/goms/design_system/component/clickable/gomsClickable.kt b/core/design-system/src/main/java/com/goms/design_system/component/clickable/gomsClickable.kt
@@ -17,7 +17,7 @@ fun Modifier.gomsClickable(
     rippleColor: Color? = null,
     onClickLabel: String? = null,
     role: Role? = null,
-    interval: Long = 1000L,
+    interval: Long = 1_000L,
     onClick: () -> Unit
 ) = composed(
     inspectorInfo = debugInspectorInfo {

diff --git a/...src/main/java/com/goms/design_system/component/indicator/GomsCircularProgressIndicator.kt b/...src/main/java/com/goms/design_system/component/indicator/GomsCircularProgressIndicator.kt
@@ -47,7 +47,7 @@ fun GomsCircularProgressIndicator() {
             targetValue = 0f,
             animationSpec = infiniteRepeatable(
                 animation = tween(
-                    durationMillis = 1000,
+                    durationMillis = 1_000,
                     easing = LinearEasing
                 ),
                 repeatMode = RepeatMode.Restart

diff --git a/core/design-system/src/main/java/com/goms/design_system/component/lottie/AnimatedLottie.kt b/core/design-system/src/main/java/com/goms/design_system/component/lottie/AnimatedLottie.kt
@@ -0,0 +1,37 @@
+package com.goms.design_system.component.lottie
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import com.airbnb.lottie.compose.LottieAnimation
+import com.airbnb.lottie.compose.LottieCompositionSpec
+import com.airbnb.lottie.compose.LottieConstants
+import com.airbnb.lottie.compose.animateLottieCompositionAsState
+import com.airbnb.lottie.compose.rememberLottieComposition
+
+@Composable
+fun AnimatedLottie (
+    rawId: Int,
+    modifier: Modifier = Modifier,
+    isInfiniteRepetition: Boolean = false
+) {
+    val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(rawId))
+
+    val iterations = if (isInfiniteRepetition){
+        LottieConstants.IterateForever
+    } else {
+        1
+    }
+
+    val progress by animateLottieCompositionAsState(
+        composition = composition,
+        iterations = iterations,
+        isPlaying = true
+    )
+
+    LottieAnimation( 
+        composition = composition,
+        progress = { progress },
+        modifier = modifier
+    )
+}
diff --git a/core/design-system/src/main/java/com/goms/design_system/component/shimmer/ShimmerBrush.kt b/core/design-system/src/main/java/com/goms/design_system/component/shimmer/ShimmerBrush.kt
@@ -14,7 +14,7 @@ import androidx.compose.ui.graphics.Color
 @Composable
 fun ShimmerBrush(
     color: Color = Color.LightGray,
-    targetValue: Float = 1300f
+    targetValue: Float = 1_300f
 ): Brush {
     val shimmerColors = listOf(
         color.copy(alpha = 0.1f),
@@ -30,7 +30,7 @@ fun ShimmerBrush(
         targetValue = targetValue,
         animationSpec = infiniteRepeatable(
             animation = tween(
-                durationMillis = 1000,
+                durationMillis = 1_000,
                 easing = FastOutSlowInEasing
             ), repeatMode = RepeatMode.Restart
         )

diff --git a/core/design-system/src/main/java/com/goms/design_system/component/shimmer/shimmerEffect.kt b/core/design-system/src/main/java/com/goms/design_system/component/shimmer/shimmerEffect.kt
@@ -17,7 +17,7 @@ import com.goms.design_system.theme.ThemeType
 
 fun Modifier.shimmerEffect(
     color: Color = Color.LightGray,
-    targetValue: Float = 1300f,
+    targetValue: Float = 1_300f,
     shape: Shape = CircleShape
 ) = composed {
     val brush = ShimmerBrush(

diff --git a/core/design-system/src/main/java/com/goms/design_system/component/text/LinkText.kt b/core/design-system/src/main/java/com/goms/design_system/component/text/LinkText.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -38,7 +39,7 @@ fun LinkText(
                 .height(20.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            Divider(
+            HorizontalDivider(
                 modifier = Modifier
                     .weight(1f)
                     .height(1.dp),
@@ -51,7 +52,7 @@ fun LinkText(
                 fontWeight = FontWeight.Normal,
                 color = colors.G4
             )
-            Divider(
+            HorizontalDivider(
                 modifier = Modifier
                     .weight(1f)
                     .height(1.dp),

diff --git a/core/design-system/src/main/java/com/goms/design_system/component/timer/CountdownTimer.kt b/core/design-system/src/main/java/com/goms/design_system/component/timer/CountdownTimer.kt
@@ -36,7 +36,7 @@ fun CountdownTimer(
         if (remainingTime == 0) {
             onTimerFinish()
         }
-        delay(1000)
+        delay(1_000L)
         remainingTime--
     }
 

diff --git a/core/design-system/src/main/res/raw/blacklist.json b/core/design-system/src/main/res/raw/blacklist.json
@@ -0,0 +1 @@
+{"assets":[],"ddd":0,"fr":60,"h":300,"ip":0,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Group 1","hd":false,"sr":1,"ks":{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":1,"k":[{"t":0,"s":[120,150],"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"ti":[0,0],"to":[0,0]},{"t":3.6,"s":[180,150],"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"ti":[0,0],"to":[0,0]},{"t":7.2,"s":[125,150],"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"ti":[0,0],"to":[0,0]},{"t":11.4,"s":[170,150],"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"ti":[0,0],"to":[0,0]},{"t":15.6,"s":[135,150],"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"ti":[0,0],"to":[0,0]},{"t":20.4,"s":[160,150],"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"ti":[0,0],"to":[0,0]},{"t":25.2,"s":[145,150],"i":{"x":0,"y":1},"o":{"x":0,"y":0},"ti":[0,0],"to":[0,0]},{"t":30,"s":[150,150],"i":{"x":0,"y":0},"o":{"x":1,"y":1}}]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}},"ao":0,"ip":0,"op":31,"st":0,"bm":0,"shapes":[{"ty":"gr","hd":false,"nm":"Path 1 Group","bm":0,"it":[{"ty":"sh","hd":false,"nm":"Path 1","d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[3.587,0],[14.347,-9],[-4.916,0],[-11.967,5.774],[0,4.5]],"o":[[0,-3.741],[0,0],[-14.347,9],[1.195,0],[15.543,-7.5],[0,0]],"v":[[187,75.5],[181.022,68],[153.523,77],[133.198,108],[163.088,84.5],[187,75.5]]}}},{"ty":"fl","hd":false,"bm":0,"c":{"a":0,"k":[0.2,0.2,0.2]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","nm":"Transform","a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[-120,-120]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}}],"np":0},{"ty":"gr","hd":false,"nm":"Path 1 Group","bm":0,"it":[{"ty":"sh","hd":false,"nm":"Path 1","d":1,"ks":{"a":0,"k":{"c":true,"i":[[0,0],[7.732,0],[0,11.046],[-7.732,0],[0,-11.046]],"o":[[0,11.046],[-7.732,0],[0,-11.046],[7.732,0],[0,0]],"v":[[166,113],[152,133],[138,113],[152,93],[166,113]]}}},{"ty":"fl","hd":false,"bm":0,"c":{"a":0,"k":[0.2,0.2,0.2]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","nm":"Transform","a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[-120,-120]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}}],"np":0},{"ty":"gr","hd":false,"nm":"Path 1 Group","bm":0,"it":[{"ty":"sh","hd":false,"nm":"Path 1","d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[-3.587,0],[-14.348,-9],[4.916,0],[11.967,5.774],[0,4.5]],"o":[[0,-3.741],[0,0],[14.346,9],[-1.195,0],[-15.542,-7.5],[0,0]],"v":[[53,75.5],[58.978,68],[86.478,77],[106.802,108],[76.912,84.5],[53,75.5]]}}},{"ty":"fl","hd":false,"bm":0,"c":{"a":0,"k":[0.2,0.2,0.2]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","nm":"Transform","a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[-120,-120]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}}],"np":0},{"ty":"gr","hd":false,"nm":"Path 1 Group","bm":0,"it":[{"ty":"sh","hd":false,"nm":"Path 1","d":1,"ks":{"a":0,"k":{"c":true,"i":[[0,0],[7.732,0],[0,11.046],[-7.732,0],[0,-11.046]],"o":[[0,11.046],[-7.732,0],[0,-11.046],[7.732,0],[0,0]],"v":[[102,113],[88,133],[74,113],[88,93],[102,113]]}}},{"ty":"fl","hd":false,"bm":0,"c":{"a":0,"k":[0.2,0.2,0.2]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","nm":"Transform","a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[-120,-120]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}}],"np":0},{"ty":"gr","hd":false,"nm":"Path 1 Group","bm":0,"it":[{"ty":"sh","hd":false,"nm":"Path 1","d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[16.569,0],[0,13.255],[-16.569,0],[0,-13.255]],"o":[[0,13.255],[-16.569,0],[0,-13.255],[16.569,0],[0,0]],"v":[[156,173],[120,170],[84,173],[120,149],[156,173]]}}},{"ty":"fl","hd":false,"bm":0,"c":{"a":0,"k":[0.2,0.2,0.2]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","nm":"Transform","a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[-120,-120]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}}],"np":0},{"ty":"gr","hd":false,"nm":"Path 1 Group","bm":0,"it":[{"ty":"sh","hd":false,"nm":"Path 1","d":1,"ks":{"a":0,"k":{"c":true,"i":[[0,0],[66.274,0],[0,66.274],[-66.274,0],[0,-66.274]],"o":[[0,66.274],[-66.274,0],[0,-66.274],[66.274,0],[0,0]],"v":[[240,120],[120,240],[0,120],[120,0],[240,120]]}}},{"ty":"fl","hd":false,"bm":0,"c":{"a":0,"k":[0.969,0.467,0.094]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","nm":"Transform","a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[-120,-120]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}}],"np":0}]}],"meta":{"g":"@phase-software/lottie-exporter 0.6.0"},"nm":"","op":30,"v":"5.6.0","w":300}
diff --git a/core/design-system/src/main/res/raw/outing_failed.json b/core/design-system/src/main/res/raw/outing_failed.json
@@ -0,0 +1 @@
+{"assets":[],"ddd":0,"fr":60,"h":300,"ip":0,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Group 2","hd":false,"sr":1,"ks":{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[150,150]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}},"ao":0,"ip":0,"op":91,"st":0,"bm":0,"shapes":[{"ty":"gr","hd":false,"nm":"Group 1 Group","bm":0,"it":[{"ty":"gr","hd":false,"nm":"Path 1 Group","bm":0,"it":[{"ty":"sh","hd":false,"nm":"Path 1","d":1,"ks":{"a":0,"k":{"c":true,"i":[[0,0],[16.569,0],[0,13.255],[-16.569,0],[0,-13.255]],"o":[[0,13.255],[-16.569,0],[0,-13.255],[16.569,0],[0,0]],"v":[[150,168],[120,192],[90,168],[120,144],[150,168]]}}},{"ty":"fl","hd":false,"bm":0,"c":{"a":0,"k":[0.2,0.2,0.2]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","nm":"Transform","a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[-120,-136]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}}],"np":0},{"ty":"gr","hd":false,"nm":"Path 1 (8) Group","bm":0,"it":[{"ty":"sh","hd":false,"nm":"Path 1 (8)","d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[64,80],[82,98]]}}},{"ty":"sh","hd":false,"nm":"Path 1 (8)","d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[100,116],[82,98]]}}},{"ty":"sh","hd":false,"nm":"Path 1 (8)","d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[82,98],[100,80]]}}},{"ty":"sh","hd":false,"nm":"Path 1 (8)","d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[82,98],[64,116]]}}},{"ty":"sh","hd":false,"nm":"Path 1 (8)","d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[140,80],[158,98]]}}},{"ty":"sh","hd":false,"nm":"Path 1 (8)","d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[176,116],[158,98]]}}},{"ty":"sh","hd":false,"nm":"Path 1 (8)","d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[158,98],[176,80]]}}},{"ty":"sh","hd":false,"nm":"Path 1 (8)","d":1,"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[158,98],[140,116]]}}},{"ty":"st","hd":false,"bm":0,"c":{"a":0,"k":[0.2,0.2,0.2]},"lc":2,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":20}},{"ty":"tr","nm":"Transform","a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[-120,-136]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}}],"np":0},{"ty":"tr","nm":"Transform","a":{"a":0,"k":[0,0]},"o":{"a":1,"k":[{"t":0,"s":[0],"i":{"x":0.75,"y":0.75},"o":{"x":0.25,"y":0.25}},{"t":56.4,"s":[0],"i":{"x":0.75,"y":0.75},"o":{"x":0.25,"y":0.25}},{"t":57,"s":[100],"i":{"x":0,"y":0},"o":{"x":1,"y":1}}]},"p":{"a":1,"k":[{"t":0,"s":[0,16],"i":{"x":0.3,"y":1.35},"o":{"x":0.7,"y":-0.35}},{"t":57,"s":[0,16],"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"ti":[0,0],"to":[0,0]},{"t":60,"s":[10,16],"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"ti":[0,0],"to":[0,0]},{"t":63,"s":[-7,16],"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"ti":[0,0],"to":[0,0]},{"t":66,"s":[6,16],"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"ti":[0,0],"to":[0,0]},{"t":69,"s":[-2,16],"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"ti":[0,0],"to":[0,0]},{"t":72,"s":[0,16],"i":{"x":0,"y":0},"o":{"x":1,"y":1}}]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}}],"np":0},{"ty":"gr","hd":false,"nm":"Face Group","bm":0,"it":[{"ty":"sh","hd":false,"nm":"Face","d":1,"ks":{"a":0,"k":{"c":true,"i":[[0,0],[66.274,0],[0,66.274],[-66.274,0],[0,-66.274]],"o":[[0,66.274],[-66.274,0],[0,-66.274],[66.274,0],[0,0]],"v":[[240,120],[120,240],[0,120],[120,0],[240,120]]}}},{"ty":"fl","hd":false,"bm":0,"c":{"a":0,"k":[1,0.894,0.196]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","nm":"Transform","a":{"a":0,"k":[120,120]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":1,"k":[{"t":0,"s":[0,0],"i":{"x":0.15,"y":1.35},"o":{"x":0.15,"y":0.45}},{"t":60,"s":[100,100],"i":{"x":0,"y":0},"o":{"x":1,"y":1}}]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}}],"np":0}]}],"meta":{"g":"@phase-software/lottie-exporter 0.6.0"},"nm":"","op":90,"v":"5.6.0","w":300}