From ea5c3a7c5efaa38970461a85b7d8911e9f4a4eca Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 17 Aug 2023 15:31:16 -0300 Subject: [PATCH 01/37] Update compileSdk to 34. --- .../segmentedprogressbar/SegmentedProgressBar.kt | 2 +- .../ui/custom/CustomChatColorGradientToolView.kt | 2 +- .../securesms/scribbles/RotationDialView.kt | 2 +- .../stories/viewer/page/StoryViewerPageFragment.kt | 10 +++++----- constants.gradle.kts | 8 ++++---- reproducible-builds/Dockerfile | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt b/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt index a572f6fe46..3cf80a6719 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt @@ -197,7 +197,7 @@ class SegmentedProgressBar : View, ViewPager.OnPageChangeListener, View.OnTouchL setLayerType(LAYER_TYPE_SOFTWARE, null) } - override fun onDraw(canvas: Canvas?) { + override fun onDraw(canvas: Canvas) { super.onDraw(canvas) segments.forEachIndexed { index, segment -> diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorGradientToolView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorGradientToolView.kt index e1781a948a..b59dee3540 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorGradientToolView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorGradientToolView.kt @@ -287,7 +287,7 @@ class CustomChatColorGradientToolView @JvmOverloads constructor( } override fun onScroll( - e1: MotionEvent, + e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/RotationDialView.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/RotationDialView.kt index 3a714e7d7a..ef32334d57 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/RotationDialView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/RotationDialView.kt @@ -187,7 +187,7 @@ class RotationDialView @JvmOverloads constructor( return true } - override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean { + override fun onScroll(e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean { val degreeIncrement: Float = distanceX / dimensions.spaceBetweenAngleIndicators val prevDialDegrees = getDialDegrees(degrees) val newDialDegrees = getDialDegrees(degrees + degreeIncrement) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt index 29b186e384..690319781a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt @@ -1231,7 +1231,7 @@ class StoryViewerPageFragment : return true } - override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean { + override fun onScroll(e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean { val isFirstStory = sharedViewModel.stateSnapshot.page == 0 val isLastStory = sharedViewModel.stateSnapshot.pages.lastIndex == sharedViewModel.stateSnapshot.page val isXMagnitudeGreaterThanYMagnitude = abs(distanceX) > abs(distanceY) || viewToTranslate.translationX > 0f @@ -1240,7 +1240,7 @@ class StoryViewerPageFragment : sharedViewModel.setIsChildScrolling(isXMagnitudeGreaterThanYMagnitude || isFirstAndHasYTranslationOrNegativeY || isLastAndHasYTranslationOrNegativeY) if (isFirstStory) { - val delta = max(0f, (e2.rawY - e1.rawY)) / 3f + val delta = max(0f, (e2.rawY - (e1?.rawY ?: 0f))) / 3f val percent = INTERPOLATOR.getInterpolation(delta / maxSlide) val distance = maxSlide * percent @@ -1249,7 +1249,7 @@ class StoryViewerPageFragment : } if (isLastStory) { - val delta = max(0f, (e1.rawY - e2.rawY)) / 3f + val delta = max(0f, ((e1?.rawY ?: 0f) - e2.rawY)) / 3f val percent = -INTERPOLATOR.getInterpolation(delta / maxSlide) val distance = maxSlide * percent @@ -1257,7 +1257,7 @@ class StoryViewerPageFragment : viewToTranslate.translationY = distance } - val delta = max(0f, (e2.rawX - e1.rawX)) / 3f + val delta = max(0f, (e2.rawX - (e1?.rawX ?: 0f))) / 3f val percent = INTERPOLATOR.getInterpolation(delta / maxSlide) val distance = maxSlide * percent @@ -1269,7 +1269,7 @@ class StoryViewerPageFragment : return true } - override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { + override fun onFling(e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { val isSideSwipe = abs(velocityX) > abs(velocityY) if (!isSideSwipe) { return false diff --git a/constants.gradle.kts b/constants.gradle.kts index 79a0a00f3b..5bebdd47f7 100644 --- a/constants.gradle.kts +++ b/constants.gradle.kts @@ -1,6 +1,6 @@ -val signalBuildToolsVersion by extra("32.0.0") -val signalCompileSdkVersion by extra("android-33") +val signalBuildToolsVersion by extra("34.0.0") +val signalCompileSdkVersion by extra("android-34") val signalTargetSdkVersion by extra(31) val signalMinSdkVersion by extra(21) -val signalJavaVersion by extra(JavaVersion.VERSION_11) -val signalKotlinJvmTarget by extra("11") \ No newline at end of file +val signalJavaVersion by extra(JavaVersion.VERSION_17) +val signalKotlinJvmTarget by extra("17") \ No newline at end of file diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile index 3fed2e10d5..7a2806fab0 100644 --- a/reproducible-builds/Dockerfile +++ b/reproducible-builds/Dockerfile @@ -12,11 +12,11 @@ RUN apt install -oAcquire::https::Verify-Peer=false -y ca-certificates # Back to normal, verification back on RUN apt update -RUN apt install -y git openjdk-11-jdk openjdk-17-jdk unzip wget +RUN apt install -y git openjdk-17-jdk unzip wget -ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-7583922_latest.zip -ENV ANDROID_API_LEVELS android-33 -ENV ANDROID_BUILD_TOOLS_VERSION 32.0.0 +ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-10406996_latest.zip +ENV ANDROID_API_LEVELS android-34 +ENV ANDROID_BUILD_TOOLS_VERSION 34.0.0 ENV ANDROID_HOME /usr/local/android-sdk-linux ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin From 32ae4393e26c16c970ad18480a4be0d664ed7c3d Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 18 Aug 2023 11:47:04 -0300 Subject: [PATCH 02/37] Fix issue with CIV2 where avatars would not load. --- .../conversation/v2/items/V2ConversationItemShapeTest.kt | 4 ++++ .../securesms/conversation/v2/ConversationAdapterV2.kt | 2 +- .../securesms/conversation/v2/items/V2ConversationContext.kt | 2 ++ .../conversation/v2/items/V2ConversationItemViewHolder.kt | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt index d0a625017a..b24713330e 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt @@ -8,6 +8,7 @@ package org.thoughtcrime.securesms.conversation.v2.items import android.net.Uri import android.view.View import androidx.lifecycle.Observer +import androidx.test.platform.app.InstrumentationRegistry import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test @@ -28,6 +29,8 @@ import org.thoughtcrime.securesms.groups.GroupId import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange import org.thoughtcrime.securesms.linkpreview.LinkPreview import org.thoughtcrime.securesms.mediapreview.MediaIntentFactory +import org.thoughtcrime.securesms.mms.GlideApp +import org.thoughtcrime.securesms.mms.GlideRequests import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.stickers.StickerLocator @@ -214,6 +217,7 @@ class V2ConversationItemShapeTest { override val selectedItems: Set = emptySet() override val isMessageRequestAccepted: Boolean = true override val searchQuery: String? = null + override val glideRequests: GlideRequests = GlideApp.with(InstrumentationRegistry.getInstrumentation().context) override fun onStartExpirationTimeout(messageRecord: MessageRecord) = Unit diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt index 4e7908b523..58795cbfbb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt @@ -59,7 +59,7 @@ import java.util.Optional class ConversationAdapterV2( private val lifecycleOwner: LifecycleOwner, - private val glideRequests: GlideRequests, + override val glideRequests: GlideRequests, override val clickListener: ItemClickListener, private var hasWallpaper: Boolean, private val colorizer: Colorizer, diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext.kt index 22c3cf5e41..2439824623 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext.kt @@ -10,12 +10,14 @@ import org.thoughtcrime.securesms.conversation.ConversationItemDisplayMode import org.thoughtcrime.securesms.conversation.colors.Colorizer import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart import org.thoughtcrime.securesms.database.model.MessageRecord +import org.thoughtcrime.securesms.mms.GlideRequests /** * Describes the Adapter "context" that would normally have been * visible to an inner class. */ interface V2ConversationContext { + val glideRequests: GlideRequests val displayMode: ConversationItemDisplayMode val clickListener: ConversationAdapter.ItemClickListener val selectedItems: Set diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder.kt index dad2c4f70f..43bd8e2c38 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder.kt @@ -417,8 +417,8 @@ class V2TextOnlyViewHolder>( binding.senderName.text = sender.getDisplayName(context) binding.senderName.setTextColor(conversationContext.getColorizer().getIncomingGroupSenderColor(context, sender)) - binding.senderPhoto.setAvatar(sender) - binding.senderBadge.setBadgeFromRecipient(sender) + binding.senderPhoto.setAvatar(conversationContext.glideRequests, sender, false) + binding.senderBadge.setBadgeFromRecipient(sender, conversationContext.glideRequests) } else { binding.senderName.visible = false binding.senderPhoto.visible = false From 4494d8652da0b88077fa7f86730c205a70f714bc Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 18 Aug 2023 14:12:36 -0300 Subject: [PATCH 03/37] Add several performance improvements to ConversationItemV2. --- .../securesms/badges/BadgeImageView.kt | 6 +- .../badges/glide/BadgeSpriteTransformation.kt | 142 ++++++++------- .../conversation/ConversationItem.java | 5 + .../conversation/v2/ConversationFragment.kt | 3 + .../v2/items/ChatColorsDrawable.kt | 165 ++++++++++++++++++ .../items/InteractiveConversationElement.kt | 2 +- .../v2/items/V2ConversationItemShape.kt | 13 -- ...V2ConversationItemTextOnlyBindingBridge.kt | 2 +- .../v2/items/V2ConversationItemTheme.kt | 25 ++- .../v2/items/V2ConversationItemViewHolder.kt | 107 ++++++++---- 10 files changed, 342 insertions(+), 128 deletions(-) create mode 100644 app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable.kt diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt index c011b6e937..3750f02674 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt @@ -95,8 +95,10 @@ class BadgeImageView @JvmOverloads constructor( } private fun clearDrawable() { - setImageDrawable(null) - isClickable = false + if (drawable != null) { + setImageDrawable(null) + isClickable = false + } } private fun getGlideRequests(): GlideRequests? { diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt index 22ad39d217..9cea8285ee 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt @@ -59,73 +59,93 @@ class BadgeSpriteTransformation( return outBitmap } - enum class Size(val code: String, val frameMap: Map) { + enum class Size(val code: String) { SMALL( - "small", - mapOf( - Density.LDPI to FrameSet(Frame(124, 1, 12, 12), Frame(145, 31, 12, 12)), - Density.MDPI to FrameSet(Frame(163, 1, 16, 16), Frame(189, 39, 16, 16)), - Density.HDPI to FrameSet(Frame(244, 1, 24, 24), Frame(283, 58, 24, 24)), - Density.XHDPI to FrameSet(Frame(323, 1, 32, 32), Frame(373, 75, 32, 32)), - Density.XXHDPI to FrameSet(Frame(483, 1, 48, 48), Frame(557, 111, 48, 48)), - Density.XXXHDPI to FrameSet(Frame(643, 1, 64, 64), Frame(741, 147, 64, 64)) - ) - ), + "small" + ) { + override val frameMap: Map by lazy { + mapOf( + Density.LDPI to FrameSet(Frame(124, 1, 12, 12), Frame(145, 31, 12, 12)), + Density.MDPI to FrameSet(Frame(163, 1, 16, 16), Frame(189, 39, 16, 16)), + Density.HDPI to FrameSet(Frame(244, 1, 24, 24), Frame(283, 58, 24, 24)), + Density.XHDPI to FrameSet(Frame(323, 1, 32, 32), Frame(373, 75, 32, 32)), + Density.XXHDPI to FrameSet(Frame(483, 1, 48, 48), Frame(557, 111, 48, 48)), + Density.XXXHDPI to FrameSet(Frame(643, 1, 64, 64), Frame(741, 147, 64, 64)) + ) + } + }, MEDIUM( - "medium", - mapOf( - Density.LDPI to FrameSet(Frame(124, 16, 18, 18), Frame(160, 31, 18, 18)), - Density.MDPI to FrameSet(Frame(163, 19, 24, 24), Frame(207, 39, 24, 24)), - Density.HDPI to FrameSet(Frame(244, 28, 36, 36), Frame(310, 58, 36, 36)), - Density.XHDPI to FrameSet(Frame(323, 35, 48, 48), Frame(407, 75, 48, 48)), - Density.XXHDPI to FrameSet(Frame(483, 51, 72, 72), Frame(607, 111, 72, 72)), - Density.XXXHDPI to FrameSet(Frame(643, 67, 96, 96), Frame(807, 147, 96, 96)) - ) - ), + "medium" + ) { + override val frameMap: Map by lazy { + mapOf( + Density.LDPI to FrameSet(Frame(124, 16, 18, 18), Frame(160, 31, 18, 18)), + Density.MDPI to FrameSet(Frame(163, 19, 24, 24), Frame(207, 39, 24, 24)), + Density.HDPI to FrameSet(Frame(244, 28, 36, 36), Frame(310, 58, 36, 36)), + Density.XHDPI to FrameSet(Frame(323, 35, 48, 48), Frame(407, 75, 48, 48)), + Density.XXHDPI to FrameSet(Frame(483, 51, 72, 72), Frame(607, 111, 72, 72)), + Density.XXXHDPI to FrameSet(Frame(643, 67, 96, 96), Frame(807, 147, 96, 96)) + ) + } + }, LARGE( - "large", - mapOf( - Density.LDPI to FrameSet(Frame(145, 1, 27, 27), Frame(124, 46, 27, 27)), - Density.MDPI to FrameSet(Frame(189, 1, 36, 36), Frame(163, 57, 36, 36)), - Density.HDPI to FrameSet(Frame(283, 1, 54, 54), Frame(244, 85, 54, 54)), - Density.XHDPI to FrameSet(Frame(373, 1, 72, 72), Frame(323, 109, 72, 72)), - Density.XXHDPI to FrameSet(Frame(557, 1, 108, 108), Frame(483, 161, 108, 108)), - Density.XXXHDPI to FrameSet(Frame(741, 1, 144, 144), Frame(643, 213, 144, 144)) - ) - ), + "large" + ) { + override val frameMap: Map by lazy { + mapOf( + Density.LDPI to FrameSet(Frame(145, 1, 27, 27), Frame(124, 46, 27, 27)), + Density.MDPI to FrameSet(Frame(189, 1, 36, 36), Frame(163, 57, 36, 36)), + Density.HDPI to FrameSet(Frame(283, 1, 54, 54), Frame(244, 85, 54, 54)), + Density.XHDPI to FrameSet(Frame(373, 1, 72, 72), Frame(323, 109, 72, 72)), + Density.XXHDPI to FrameSet(Frame(557, 1, 108, 108), Frame(483, 161, 108, 108)), + Density.XXXHDPI to FrameSet(Frame(741, 1, 144, 144), Frame(643, 213, 144, 144)) + ) + } + }, BADGE_64( - "badge_64", - mapOf( - Density.LDPI to FrameSet(Frame(124, 73, 48, 48), Frame(124, 73, 48, 48)), - Density.MDPI to FrameSet(Frame(163, 97, 64, 64), Frame(163, 97, 64, 64)), - Density.HDPI to FrameSet(Frame(244, 145, 96, 96), Frame(244, 145, 96, 96)), - Density.XHDPI to FrameSet(Frame(323, 193, 128, 128), Frame(323, 193, 128, 128)), - Density.XXHDPI to FrameSet(Frame(483, 289, 192, 192), Frame(483, 289, 192, 192)), - Density.XXXHDPI to FrameSet(Frame(643, 385, 256, 256), Frame(643, 385, 256, 256)) - ) - ), + "badge_64" + ) { + override val frameMap: Map by lazy { + mapOf( + Density.LDPI to FrameSet(Frame(124, 73, 48, 48), Frame(124, 73, 48, 48)), + Density.MDPI to FrameSet(Frame(163, 97, 64, 64), Frame(163, 97, 64, 64)), + Density.HDPI to FrameSet(Frame(244, 145, 96, 96), Frame(244, 145, 96, 96)), + Density.XHDPI to FrameSet(Frame(323, 193, 128, 128), Frame(323, 193, 128, 128)), + Density.XXHDPI to FrameSet(Frame(483, 289, 192, 192), Frame(483, 289, 192, 192)), + Density.XXXHDPI to FrameSet(Frame(643, 385, 256, 256), Frame(643, 385, 256, 256)) + ) + } + }, BADGE_112( - "badge_112", - mapOf( - Density.LDPI to FrameSet(Frame(181, 1, 84, 84), Frame(181, 1, 84, 84)), - Density.MDPI to FrameSet(Frame(233, 1, 112, 112), Frame(233, 1, 112, 112)), - Density.HDPI to FrameSet(Frame(349, 1, 168, 168), Frame(349, 1, 168, 168)), - Density.XHDPI to FrameSet(Frame(457, 1, 224, 224), Frame(457, 1, 224, 224)), - Density.XXHDPI to FrameSet(Frame(681, 1, 336, 336), Frame(681, 1, 336, 336)), - Density.XXXHDPI to FrameSet(Frame(905, 1, 448, 448), Frame(905, 1, 448, 448)) - ) - ), + "badge_112" + ) { + override val frameMap: Map by lazy { + mapOf( + Density.LDPI to FrameSet(Frame(181, 1, 84, 84), Frame(181, 1, 84, 84)), + Density.MDPI to FrameSet(Frame(233, 1, 112, 112), Frame(233, 1, 112, 112)), + Density.HDPI to FrameSet(Frame(349, 1, 168, 168), Frame(349, 1, 168, 168)), + Density.XHDPI to FrameSet(Frame(457, 1, 224, 224), Frame(457, 1, 224, 224)), + Density.XXHDPI to FrameSet(Frame(681, 1, 336, 336), Frame(681, 1, 336, 336)), + Density.XXXHDPI to FrameSet(Frame(905, 1, 448, 448), Frame(905, 1, 448, 448)) + ) + } + }, XLARGE( - "xlarge", - mapOf( - Density.LDPI to FrameSet(Frame(1, 1, 120, 120), Frame(1, 1, 120, 120)), - Density.MDPI to FrameSet(Frame(1, 1, 160, 160), Frame(1, 1, 160, 160)), - Density.HDPI to FrameSet(Frame(1, 1, 240, 240), Frame(1, 1, 240, 240)), - Density.XHDPI to FrameSet(Frame(1, 1, 320, 320), Frame(1, 1, 320, 320)), - Density.XXHDPI to FrameSet(Frame(1, 1, 480, 480), Frame(1, 1, 480, 480)), - Density.XXXHDPI to FrameSet(Frame(1, 1, 640, 640), Frame(1, 1, 640, 640)) - ) - ); + "xlarge" + ) { + override val frameMap: Map by lazy { + mapOf( + Density.LDPI to FrameSet(Frame(1, 1, 120, 120), Frame(1, 1, 120, 120)), + Density.MDPI to FrameSet(Frame(1, 1, 160, 160), Frame(1, 1, 160, 160)), + Density.HDPI to FrameSet(Frame(1, 1, 240, 240), Frame(1, 1, 240, 240)), + Density.XHDPI to FrameSet(Frame(1, 1, 320, 320), Frame(1, 1, 320, 320)), + Density.XXHDPI to FrameSet(Frame(1, 1, 480, 480), Frame(1, 1, 480, 480)), + Density.XXXHDPI to FrameSet(Frame(1, 1, 640, 640), Frame(1, 1, 640, 640)) + ) + } + }; + + abstract val frameMap: Map companion object { fun fromInteger(integer: Int): Size { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index f4a529eb81..d05644e689 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -2303,6 +2303,11 @@ public int getAdapterPosition(@NonNull RecyclerView recyclerView) { return bodyBubble; } + @Override + public void invalidateChatColorsDrawable(@NonNull ViewGroup coordinateRoot) { + // Intentionally left blank. + } + private class SharedContactEventListener implements SharedContactView.EventListener { @Override public void onAddToContactsClicked(@NonNull Contact contact) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt index 9faa2ab984..2cd7347edc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt @@ -185,6 +185,7 @@ import org.thoughtcrime.securesms.conversation.ui.inlinequery.InlineQueryResults import org.thoughtcrime.securesms.conversation.ui.inlinequery.InlineQueryViewModelV2 import org.thoughtcrime.securesms.conversation.v2.groups.ConversationGroupCallViewModel import org.thoughtcrime.securesms.conversation.v2.groups.ConversationGroupViewModel +import org.thoughtcrime.securesms.conversation.v2.items.ChatColorsDrawable import org.thoughtcrime.securesms.conversation.v2.items.InteractiveConversationElement import org.thoughtcrime.securesms.conversation.v2.keyboard.AttachmentKeyboardFragment import org.thoughtcrime.securesms.database.DraftTable @@ -579,6 +580,8 @@ class ConversationFragment : registerForResults() inputPanel.setMediaListener(InputPanelMediaListener()) + + ChatColorsDrawable.attach(binding.conversationItemRecycler) } override fun onViewStateRestored(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable.kt new file mode 100644 index 0000000000..dbdc24bda9 --- /dev/null +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable.kt @@ -0,0 +1,165 @@ +/* + * Copyright 2023 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.thoughtcrime.securesms.conversation.v2.items + +import android.graphics.Canvas +import android.graphics.ColorFilter +import android.graphics.Path +import android.graphics.PixelFormat +import android.graphics.PointF +import android.graphics.Rect +import android.graphics.RectF +import android.graphics.drawable.Drawable +import android.view.ViewGroup +import androidx.core.graphics.withClip +import androidx.core.graphics.withTranslation +import androidx.core.view.children +import androidx.core.view.doOnDetach +import androidx.recyclerview.widget.RecyclerView +import org.thoughtcrime.securesms.conversation.colors.ChatColors +import org.thoughtcrime.securesms.util.Projection +import org.thoughtcrime.securesms.util.Projection.Corners + +/** + * Drawable that renders the given chat colors at a specified coordinate offset. + * This is meant to be used in conjunction with [ChatColorsItemDecoration] + */ +class ChatColorsDrawable : Drawable() { + + companion object { + private var maskDrawable: Drawable? = null + + /** + * Binds the ChatColorsDrawable static cache to the lifecycle of the given recycler-view + */ + fun attach(recyclerView: RecyclerView) { + recyclerView.addOnLayoutChangeListener { _, left, top, right, bottom, _, _, _, _ -> + applyBounds(Rect(left, top, right, bottom)) + } + + recyclerView.addItemDecoration(ChatColorsItemDecoration) + recyclerView.doOnDetach { + maskDrawable = null + } + } + + private fun applyBounds(bounds: Rect) { + maskDrawable?.bounds = bounds + } + } + + /** + * Translation coordinates so that the mask is drawn at the right location + * on the screen. + */ + private val maskOffset = PointF() + + /** + * Clipping path that includes the dimensions and corners for this view. + */ + private val path = Path() + + private val rect = RectF() + + private var gradientColors: ChatColors? = null + private var corners: FloatArray = floatArrayOf() + private var fillColor: Int = 0 + + override fun draw(canvas: Canvas) { + if (gradientColors == null && fillColor == 0) { + return + } + + val mask = maskDrawable + if (gradientColors != null && mask != null) { + canvas.withTranslation(-maskOffset.x, -maskOffset.y) { + canvas.withClip(path) { + mask.draw(canvas) + } + } + } else { + path.reset() + rect.set(bounds) + path.addRoundRect(rect, corners, Path.Direction.CW) + canvas.withClip(path) { + canvas.drawColor(fillColor) + } + } + } + + override fun setAlpha(alpha: Int) = Unit + + override fun setColorFilter(colorFilter: ColorFilter?) = Unit + + override fun getOpacity(): Int { + return PixelFormat.TRANSLUCENT + } + + /** + * Applies the given [Projection] as the clipping path for the canvas on subsequent draws. + * Also applies the given [Projection]'s (x,y) (Top, Left) coordinates as the mask offset, + * which is used as a canvas translation before drawing. + * + * This is done separately from setting the corners and color, because it needs to happen + * on every frame we would normally perform a decorator onDraw, whereas setting the corners + * and color only needs to happen on bind. + */ + fun applyMaskProjection(projection: Projection) { + path.reset() + projection.applyToPath(path) + + maskOffset.set( + projection.x, + projection.y + ) + + invalidateSelf() + } + + fun isSolidColor(): Boolean { + return gradientColors == null + } + + /** + * Sets the chat color and shape as specified. If the colors are a gradient, + * we will use masking to draw, and we will draw every time we're told to by + * the decorator. + * + * If a solid color is set, we can skip drawing as we move, since we haven't changed. + */ + fun setChatColors( + chatColors: ChatColors, + corners: Corners + ) { + this.gradientColors = chatColors + this.corners = corners.toRadii() + + if (chatColors.isGradient()) { + if (maskDrawable == null) { + maskDrawable = chatColors.chatBubbleMask + } + + this.fillColor = 0 + } else { + this.fillColor = chatColors.asSingleColor() + this.gradientColors = null + } + + invalidateSelf() + } + + private object ChatColorsItemDecoration : RecyclerView.ItemDecoration() { + override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { + parent.children.map { parent.getChildViewHolder(it) }.filterIsInstance().forEach { element -> + element.invalidateChatColorsDrawable(parent) + } + } + } + + interface ChatColorsDrawableInvalidator { + fun invalidateChatColorsDrawable(coordinateRoot: ViewGroup) + } +} diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/InteractiveConversationElement.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/InteractiveConversationElement.kt index 739f95a009..c2ad606263 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/InteractiveConversationElement.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/InteractiveConversationElement.kt @@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.util.ProjectionList /** * A conversation element that a user can either swipe or snapshot */ -interface InteractiveConversationElement { +interface InteractiveConversationElement : ChatColorsDrawable.ChatColorsDrawableInvalidator { val conversationMessage: ConversationMessage val root: ViewGroup diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape.kt index 07615dc5da..f077e101bf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape.kt @@ -5,8 +5,6 @@ package org.thoughtcrime.securesms.conversation.v2.items -import com.google.android.material.shape.MaterialShapeDrawable -import com.google.android.material.shape.ShapeAppearanceModel import org.signal.core.util.dp import org.thoughtcrime.securesms.database.model.MessageRecord import org.thoughtcrime.securesms.util.DateUtils @@ -36,11 +34,6 @@ class V2ConversationItemShape( var corners: Projection.Corners = Projection.Corners(bigRadius) private set - var bodyBubble: MaterialShapeDrawable = MaterialShapeDrawable( - ShapeAppearanceModel.Builder().setAllCornerSizes(bigRadius).build() - ) - private set - /** * Sets the message spacing and corners based off the given information. This * updates the class state. @@ -93,12 +86,6 @@ class V2ConversationItemShape( } corners = newCorners - bodyBubble.shapeAppearanceModel = ShapeAppearanceModel.builder() - .setTopLeftCornerSize(corners.topLeft) - .setTopRightCornerSize(corners.topRight) - .setBottomLeftCornerSize(corners.bottomLeft) - .setBottomRightCornerSize(corners.bottomRight) - .build() } private fun isSingularMessage( diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge.kt index 765c7ea0c8..63564942cf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge.kt @@ -63,7 +63,7 @@ fun V2ConversationItemTextOnlyIncomingBinding.bridge(): V2ConversationItemTextOn conversationItemFooterBackground = conversationItemFooterBackground, conversationItemAlert = null, conversationItemFooterSpace = null, - isIncoming = false + isIncoming = true ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt index 27aeaed1b3..f17c078842 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt @@ -6,7 +6,6 @@ package org.thoughtcrime.securesms.conversation.v2.items import android.content.Context -import android.content.res.ColorStateList import android.graphics.Color import androidx.annotation.ColorInt import androidx.core.content.ContextCompat @@ -64,30 +63,30 @@ class V2ConversationItemTheme( ) } + @ColorInt fun getBodyBubbleColor( conversationMessage: ConversationMessage - ): ColorStateList { + ): Int { if (conversationMessage.messageRecord.hasNoBubble(context)) { - return ColorStateList.valueOf(Color.TRANSPARENT) + return Color.TRANSPARENT } return getFooterBubbleColor(conversationMessage) } + @ColorInt fun getFooterBubbleColor( conversationMessage: ConversationMessage - ): ColorStateList { - return ColorStateList.valueOf( - if (conversationMessage.messageRecord.isOutgoing) { - Color.TRANSPARENT + ): Int { + return if (conversationMessage.messageRecord.isOutgoing) { + Color.TRANSPARENT + } else { + if (conversationContext.hasWallpaper()) { + ContextCompat.getColor(context, R.color.signal_colorSurface) } else { - if (conversationContext.hasWallpaper()) { - ContextCompat.getColor(context, R.color.signal_colorSurface) - } else { - ContextCompat.getColor(context, R.color.signal_colorSurface2) - } + ContextCompat.getColor(context, R.color.signal_colorSurface2) } - ) + } } @ColorInt diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder.kt index 43bd8e2c38..9757eb3700 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder.kt @@ -23,8 +23,6 @@ import android.view.ViewGroup.MarginLayoutParams import androidx.core.content.ContextCompat import androidx.core.view.updateLayoutParams import androidx.recyclerview.widget.RecyclerView -import com.google.android.material.shape.MaterialShapeDrawable -import com.google.android.material.shape.ShapeAppearanceModel import org.signal.core.util.StringUtil import org.signal.core.util.dp import org.thoughtcrime.securesms.R @@ -32,6 +30,7 @@ import org.thoughtcrime.securesms.components.mention.MentionAnnotation import org.thoughtcrime.securesms.conversation.BodyBubbleLayoutTransition import org.thoughtcrime.securesms.conversation.ConversationItemDisplayMode import org.thoughtcrime.securesms.conversation.ConversationMessage +import org.thoughtcrime.securesms.conversation.colors.ChatColors import org.thoughtcrime.securesms.conversation.mutiselect.Multiselect import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart import org.thoughtcrime.securesms.conversation.mutiselect.Multiselectable @@ -55,7 +54,6 @@ import org.thoughtcrime.securesms.util.VibrateUtil import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder import org.thoughtcrime.securesms.util.hasExtraText -import org.thoughtcrime.securesms.util.hasNoBubble import org.thoughtcrime.securesms.util.isScheduled import org.thoughtcrime.securesms.util.visible import java.util.Locale @@ -82,6 +80,9 @@ class V2TextOnlyViewHolder>( companion object { private val STYLE_FACTORY = StyleFactory { arrayOf(BackgroundColorSpan(Color.YELLOW), ForegroundColorSpan(Color.BLACK)) } private const val CONDENSED_MODE_MAX_LINES = 3 + + private val footerCorners = Projection.Corners(18f.dp) + private val transparentChatColors = ChatColors.forColor(ChatColors.Id.NotSet, Color.TRANSPARENT) } private var messageId: Long = Long.MAX_VALUE @@ -89,13 +90,6 @@ class V2TextOnlyViewHolder>( private val projections = ProjectionList() private val footerDelegate = V2FooterPositionDelegate(binding) - private val conversationItemFooterBackgroundCorners = Projection.Corners(18f.dp) - private val conversationItemFooterBackground = MaterialShapeDrawable( - ShapeAppearanceModel.Builder() - .setAllCornerSizes(18f.dp) - .build() - ) - override lateinit var conversationMessage: ConversationMessage override val root: ViewGroup = binding.root @@ -117,6 +111,9 @@ class V2TextOnlyViewHolder>( private var reactionMeasureListener: ReactionMeasureListener = ReactionMeasureListener() + private val bodyBubbleDrawable = ChatColorsDrawable() + private val footerDrawable = ChatColorsDrawable() + init { binding.root.addOnMeasureListener(footerDelegate) @@ -150,7 +147,15 @@ class V2TextOnlyViewHolder>( binding.conversationItemBody.setMentionBackgroundTint(ContextCompat.getColor(context, R.color.transparent_black_25)) } + binding.conversationItemBodyWrapper.background = bodyBubbleDrawable binding.conversationItemBodyWrapper.layoutTransition = BodyBubbleLayoutTransition() + + binding.conversationItemFooterBackground.background = footerDrawable + } + + override fun invalidateChatColorsDrawable(coordinateRoot: ViewGroup) { + invalidateBodyBubbleDrawable(coordinateRoot) + invalidateFooterDrawable(coordinateRoot) } override fun bind(model: Model) { @@ -164,11 +169,6 @@ class V2TextOnlyViewHolder>( adapterPosition = bindingAdapterPosition ) - shapeDelegate.bodyBubble.fillColor = themeDelegate.getBodyBubbleColor(conversationMessage) - - binding.conversationItemBodyWrapper.background = shapeDelegate.bodyBubble - binding.conversationItemReply.setBackgroundColor(themeDelegate.getReplyIconBackgroundColor()) - presentBody() presentDate(shape) presentDeliveryStatus(shape) @@ -178,6 +178,19 @@ class V2TextOnlyViewHolder>( presentSender() presentReactions() + bodyBubbleDrawable.setChatColors( + if (binding.conversationItemBody.isJumbomoji) { + transparentChatColors + } else if (binding.isIncoming) { + ChatColors.forColor(ChatColors.Id.NotSet, themeDelegate.getBodyBubbleColor(conversationMessage)) + } else { + conversationMessage.threadRecipient.chatColors + }, + shapeDelegate.corners + ) + + binding.conversationItemReply.setBackgroundColor(themeDelegate.getReplyIconBackgroundColor()) + itemView.updateLayoutParams { topMargin = shape.topPadding.toInt() bottomMargin = shape.bottomPadding.toInt() @@ -208,29 +221,13 @@ class V2TextOnlyViewHolder>( return projections } + /** + * Note: This is not necessary for CFV2 Text-Only items because the background is rendered by + * [ChatColorsDrawable] + */ override fun getColorizerProjections(coordinateRoot: ViewGroup): ProjectionList { projections.clear() - if (conversationMessage.messageRecord.isOutgoing) { - if (!conversationMessage.messageRecord.hasNoBubble(context)) { - projections.add( - Projection.relativeToParent( - coordinateRoot, - binding.conversationItemBodyWrapper, - shapeDelegate.corners - ).translateX(binding.conversationItemBodyWrapper.translationX).translateY(root.translationY) - ) - } else if (conversationContext.hasWallpaper()) { - projections.add( - Projection.relativeToParent( - coordinateRoot, - binding.conversationItemFooterBackground, - conversationItemFooterBackgroundCorners - ).translateX(binding.conversationItemFooterBackground.translationX).translateY(root.translationY) - ) - } - } - return projections } @@ -277,6 +274,36 @@ class V2TextOnlyViewHolder>( override fun shouldProjectContent(): Boolean = false + private fun invalidateFooterDrawable(coordinateRoot: ViewGroup) { + if (footerDrawable.isSolidColor()) { + return + } + + val projection = Projection.relativeToParent( + coordinateRoot, + binding.conversationItemFooterBackground, + shapeDelegate.corners + ) + + footerDrawable.applyMaskProjection(projection) + projection.release() + } + + private fun invalidateBodyBubbleDrawable(coordinateRoot: ViewGroup) { + if (bodyBubbleDrawable.isSolidColor()) { + return + } + + val projection = Projection.relativeToParent( + coordinateRoot, + binding.conversationItemBodyWrapper, + shapeDelegate.corners + ) + + bodyBubbleDrawable.applyMaskProjection(projection) + projection.release() + } + private fun MessageRecord.buildMessageId(): Long { return if (isMms) -id else id } @@ -472,8 +499,14 @@ class V2TextOnlyViewHolder>( } binding.conversationItemFooterBackground.visible = true - binding.conversationItemFooterBackground.background = conversationItemFooterBackground - conversationItemFooterBackground.fillColor = themeDelegate.getFooterBubbleColor(conversationMessage) + footerDrawable.setChatColors( + if (binding.isIncoming) { + ChatColors.forColor(ChatColors.Id.NotSet, themeDelegate.getFooterBubbleColor(conversationMessage)) + } else { + conversationMessage.threadRecipient.chatColors + }, + footerCorners + ) } private fun presentDate(shape: V2ConversationItemShape.MessageShape) { From f4df37da237663d15a4c6837f6c852754094ddee Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 18 Aug 2023 14:19:26 -0300 Subject: [PATCH 04/37] Compute ConversationItem dates in the background. --- .../conversation/ConversationMessage.java | 20 +++++++++++++++++-- .../conversation/v2/ConversationFragment.kt | 4 ++-- .../conversation/v2/ConversationRepository.kt | 6 +++--- .../conversation/v2/ConversationViewModel.kt | 2 +- .../v2/items/V2ConversationItemViewHolder.kt | 5 ++--- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java index d79c182c15..e58987ce62 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java @@ -16,15 +16,18 @@ import org.thoughtcrime.securesms.database.MentionUtil; import org.thoughtcrime.securesms.database.NoSuchMessageException; import org.thoughtcrime.securesms.database.SignalDatabase; +import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord; import org.thoughtcrime.securesms.database.model.Mention; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList; import org.thoughtcrime.securesms.recipients.Recipient; +import org.thoughtcrime.securesms.util.DateUtils; import org.thoughtcrime.securesms.util.MessageRecordUtil; import java.security.MessageDigest; import java.util.Collections; import java.util.List; +import java.util.Locale; import java.util.Objects; /** @@ -43,6 +46,7 @@ public class ConversationMessage { @NonNull private final Recipient threadRecipient; private final boolean hasBeenQuoted; @Nullable private final MessageRecord originalMessage; + @NonNull private final String formattedDate; private ConversationMessage(@NonNull MessageRecord messageRecord, @Nullable CharSequence body, @@ -50,7 +54,8 @@ private ConversationMessage(@NonNull MessageRecord messageRecord, boolean hasBeenQuoted, @Nullable MessageStyler.Result styleResult, @NonNull Recipient threadRecipient, - @Nullable MessageRecord originalMessage) + @Nullable MessageRecord originalMessage, + @NonNull String formattedDate) { this.messageRecord = messageRecord; this.hasBeenQuoted = hasBeenQuoted; @@ -58,6 +63,7 @@ private ConversationMessage(@NonNull MessageRecord messageRecord, this.styleResult = styleResult != null ? styleResult : MessageStyler.Result.none(); this.threadRecipient = threadRecipient; this.originalMessage = originalMessage; + this.formattedDate = formattedDate; if (body != null) { this.body = SpannableString.valueOf(body); @@ -90,6 +96,11 @@ public boolean hasBeenQuoted() { return hasBeenQuoted; } + @NonNull + public String getFormattedDate() { + return formattedDate; + } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -194,13 +205,18 @@ public static class ConversationMessageFactory { } } + String formattedDate = MessageRecordUtil.isScheduled(messageRecord) ? DateUtils.getOnlyTimeString(context, Locale.getDefault(), ((MediaMmsMessageRecord) messageRecord).getScheduledDate()) + : DateUtils.getSimpleRelativeTimeSpanString(context, Locale.getDefault(), messageRecord.getTimestamp()); + + return new ConversationMessage(messageRecord, styledAndMentionBody != null ? styledAndMentionBody : mentionsUpdate != null ? mentionsUpdate.getBody() : body, mentionsUpdate != null ? mentionsUpdate.getMentions() : null, hasBeenQuoted, styleResult, threadRecipient, - originalMessage); + originalMessage, + formattedDate); } /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt index 2cd7347edc..31effb5bb1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt @@ -395,7 +395,7 @@ class ConversationFragment : ConversationViewModel( threadId = args.threadId, requestedStartingPosition = args.startingPosition, - repository = ConversationRepository(context = requireContext(), isInBubble = args.conversationScreenType == ConversationScreenType.BUBBLE), + repository = ConversationRepository(localContext = requireContext(), isInBubble = args.conversationScreenType == ConversationScreenType.BUBBLE), recipientRepository = conversationRecipientRepository, messageRequestRepository = messageRequestRepository, scheduledMessagesRepository = ScheduledMessagesRepository() @@ -1035,7 +1035,7 @@ class ConversationFragment : getVoiceNoteMediaController().voiceNotePlaybackState.observe(viewLifecycleOwner, inputPanel.playbackStateObserver) - val conversationUpdateTick = ConversationUpdateTick { adapter.updateTimestamps() } + val conversationUpdateTick = ConversationUpdateTick { viewModel.pagingController.onDataInvalidated() } viewLifecycleOwner.lifecycle.addObserver(conversationUpdateTick) if (args.conversationScreenType.isInPopup) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt index b9a00bb494..a17b0dbc3a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt @@ -106,7 +106,7 @@ import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds class ConversationRepository( - context: Context, + private val localContext: Context, private val isInBubble: Boolean ) { @@ -114,7 +114,7 @@ class ConversationRepository( private val TAG = Log.tag(ConversationRepository::class.java) } - private val applicationContext = context.applicationContext + private val applicationContext = localContext.applicationContext private val oldConversationRepository = org.thoughtcrime.securesms.conversation.ConversationRepository() /** @@ -139,7 +139,7 @@ class ConversationRepository( val messageRequestData = metadata.messageRequestData val dataSource = ConversationDataSource( - applicationContext, + localContext, threadId, messageRequestData, metadata.showUniversalExpireTimerMessage, diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt index d45257acfb..2343145e2d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt @@ -74,7 +74,7 @@ import kotlin.time.Duration */ class ConversationViewModel( val threadId: Long, - requestedStartingPosition: Int, + private val requestedStartingPosition: Int, private val repository: ConversationRepository, recipientRepository: ConversationRecipientRepository, messageRequestRepository: MessageRequestRepository, diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder.kt index 9757eb3700..680fb36596 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder.kt @@ -40,7 +40,6 @@ import org.thoughtcrime.securesms.database.model.MessageRecord import org.thoughtcrime.securesms.dependencies.ApplicationDependencies import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.util.DateUtils import org.thoughtcrime.securesms.util.InterceptableLongClickCopyLinkSpan import org.thoughtcrime.securesms.util.LongClickMovementMethod import org.thoughtcrime.securesms.util.PlaceholderURLSpan @@ -532,9 +531,9 @@ class V2TextOnlyViewHolder>( } else if (record.isRateLimited) { binding.conversationItemFooterDate.setText(R.string.ConversationItem_send_paused) } else if (record.isScheduled()) { - binding.conversationItemFooterDate.text = (DateUtils.getOnlyTimeString(getContext(), Locale.getDefault(), (record as MediaMmsMessageRecord).scheduledDate)) + binding.conversationItemFooterDate.text = conversationMessage.formattedDate } else { - var date = DateUtils.getSimpleRelativeTimeSpanString(context, Locale.getDefault(), record.timestamp) + var date = conversationMessage.formattedDate if (conversationContext.displayMode != ConversationItemDisplayMode.DETAILED && record is MediaMmsMessageRecord && record.isEditMessage()) { date = getContext().getString(R.string.ConversationItem_edited_timestamp_footer, date) } From 4ab82c99a89ac3d245d8fa65828778421d4bc92b Mon Sep 17 00:00:00 2001 From: Jim Gustafson Date: Mon, 21 Aug 2023 07:10:46 -0700 Subject: [PATCH 05/37] Update to RingRTC v2.31.1 --- dependencies.gradle | 2 +- gradle/verification-metadata.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 8863ca5353..b7d8df53be 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -115,7 +115,7 @@ dependencyResolutionManagement { library('libsignal-client', 'org.signal', 'libsignal-client').versionRef('libsignal-client') library('libsignal-android', 'org.signal', 'libsignal-android').versionRef('libsignal-client') library('signal-aesgcmprovider', 'org.signal:aesgcmprovider:0.0.3') - library('signal-ringrtc', 'org.signal:ringrtc-android:2.30.0') + library('signal-ringrtc', 'org.signal:ringrtc-android:2.31.1') library('signal-android-database-sqlcipher', 'org.signal:sqlcipher-android:4.5.4-S2') // Third Party diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 6ef566d045..7b83a73372 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -5075,12 +5075,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + From 23e33852900153dc4eab44cbb539a21672b5f857 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Tue, 22 Aug 2023 13:54:07 -0400 Subject: [PATCH 06/37] Remove unused resources. --- .../webrtc/WebRtcAnswerDeclineButton.java | 371 ------------------ .../ConversationListArchiveFragment.java | 2 +- .../ConversationListFragment.java | 10 +- .../res/color-night/help_fragment_next.xml | 5 - app/src/main/res/color/help_fragment_next.xml | 5 - .../drawable-hdpi/clear_profile_avatar.webp | Bin 646 -> 0 bytes .../res/drawable-hdpi/ic_account_box.webp | Bin 244 -> 0 bytes .../drawable-hdpi/ic_close_grey600_32dp.webp | Bin 232 -> 0 bytes .../drawable-hdpi/ic_launch_white_24dp.webp | Bin 212 -> 0 bytes .../drawable-mdpi/clear_profile_avatar.webp | Bin 544 -> 0 bytes .../res/drawable-mdpi/ic_account_box.webp | Bin 182 -> 0 bytes .../drawable-mdpi/ic_close_grey600_32dp.webp | Bin 194 -> 0 bytes .../drawable-mdpi/ic_launch_white_24dp.webp | Bin 148 -> 0 bytes .../drawable-night-hdpi/ic_account_box.webp | Bin 284 -> 0 bytes .../drawable-night-mdpi/ic_account_box.webp | Bin 222 -> 0 bytes .../drawable-night-xhdpi/ic_account_box.webp | Bin 358 -> 0 bytes .../drawable-night-xxhdpi/ic_account_box.webp | Bin 490 -> 0 bytes .../res/drawable-night/ic_invite_circle.xml | 14 - .../preference_username_background.xml | 5 - .../main/res/drawable-night/sms_megaphone.xml | 18 - .../mediarail_button_background.xml | 19 - .../drawable-xhdpi/clear_profile_avatar.webp | Bin 836 -> 0 bytes .../res/drawable-xhdpi/ic_account_box.webp | Bin 316 -> 0 bytes .../drawable-xhdpi/ic_close_grey600_32dp.webp | Bin 260 -> 0 bytes .../drawable-xhdpi/ic_launch_white_24dp.webp | Bin 214 -> 0 bytes .../drawable-xxhdpi/clear_profile_avatar.webp | Bin 1242 -> 0 bytes .../res/drawable-xxhdpi/ic_account_box.webp | Bin 438 -> 0 bytes .../ic_close_grey600_32dp.webp | Bin 386 -> 0 bytes .../drawable-xxhdpi/ic_launch_white_24dp.webp | Bin 278 -> 0 bytes .../clear_profile_avatar.webp | Bin 1736 -> 0 bytes .../ic_close_grey600_32dp.webp | Bin 404 -> 0 bytes .../ic_launch_white_24dp.webp | Bin 356 -> 0 bytes .../drawable/ic_add_reaction_outline_24.xml | 10 - ...ic_app_icon_signal_default_top_preview.xml | 9 - app/src/main/res/drawable/ic_close_14.xml | 9 - .../main/res/drawable/ic_group_solid_24.xml | 9 - .../main/res/drawable/ic_invite_circle.xml | 14 - .../main/res/drawable/ic_location_sticker.xml | 13 - app/src/main/res/drawable/ic_ring_28.xml | 9 - .../main/res/drawable/ic_send_outline_24.xml | 13 - .../main/res/drawable/ic_switch_camera_28.xml | 9 - .../drawable/ic_transfer_phone_outline_60.xml | 12 - .../drawable/ic_video_off_solid_white_28.xml | 9 - .../res/drawable/insight_modal_background.xml | 5 - .../insights_cta_button_background.xml | 5 - .../drawable/mediarail_button_background.xml | 5 - .../drawable/message_bubble_background.xml | 6 - app/src/main/res/drawable/pill.xml | 5 - .../preference_username_background.xml | 5 - ...tration_no_cell_service_warning_border.xml | 7 - .../drawable/rounded_rectangle_secondary.xml | 5 - app/src/main/res/drawable/sms_megaphone.xml | 18 - app/src/main/res/drawable/symbol_album_24.xml | 13 - .../drawable/symbol_archive_android_24.xml | 13 - .../drawable/symbol_archive_android_up_24.xml | 13 - .../res/drawable/symbol_bell_ring_fill_24.xml | 18 - .../res/drawable/symbol_check_bold_24.xml | 9 - .../main/res/drawable/symbol_mic_fill_24.xml | 12 - .../res/drawable/symbol_payment_bold_16.xml | 10 - .../drawable/symbol_schedulemessage_24.xml | 12 - .../main/res/drawable/symbol_x_bold_24.xml | 9 - .../res/layout/activity_app_icon_settings.xml | 11 - .../main/res/layout/base_kbs_pin_fragment.xml | 10 - .../layout/contact_selection_list_divider.xml | 14 - .../contact_selection_recyclerview_header.xml | 10 - app/src/main/res/layout/load_more_header.xml | 48 --- app/src/main/res/layout/new_call_activity.xml | 6 - .../layout/signal_bottom_action_bar_item.xml | 2 +- .../res/layout/signal_context_menu_item.xml | 2 +- .../layout/stories_reaction_bar_layout.xml | 15 - .../res/layout/switch_compat_preference.xml | 11 - app/src/main/res/menu/conversation_popup.xml | 10 - app/src/main/res/menu/verify_identity.xml | 8 - .../res/mipmap-hdpi/ic_person_shortcut.webp | Bin 2096 -> 0 bytes .../res/mipmap-mdpi/ic_person_shortcut.webp | Bin 1202 -> 0 bytes .../res/mipmap-xhdpi/ic_person_shortcut.webp | Bin 2598 -> 0 bytes .../res/mipmap-xxhdpi/ic_person_shortcut.webp | Bin 5130 -> 0 bytes .../mipmap-xxxhdpi/ic_person_shortcut.webp | Bin 7082 -> 0 bytes .../main/res/raw-night/lottie_kbs_fail.json | 1 - .../res/raw-night/lottie_kbs_loading.json | 1 - .../res/raw-night/lottie_kbs_success.json | 1 - .../main/res/raw/lottie_15s_play_pause.json | 1 - app/src/main/res/raw/lottie_insights_100.json | 1 - app/src/main/res/raw/lottie_kbs_fail.json | 1 - app/src/main/res/raw/lottie_kbs_loading.json | 1 - app/src/main/res/raw/lottie_kbs_success.json | 1 - .../raw/lottie_message_requests_splash.json | 1 - app/src/main/res/values-land/dimens.xml | 9 - app/src/main/res/values-night/dark_themes.xml | 2 - .../main/res/values-night/signal_styles.xml | 2 - app/src/main/res/values-v11/styles.xml | 7 - app/src/main/res/values-v21/text_styles.xml | 4 - app/src/main/res/values-v21/themes.xml | 14 - app/src/main/res/values-v23/themes.xml | 6 - app/src/main/res/values-v27/themes.xml | 8 - app/src/main/res/values-v9/styles.xml | 5 - app/src/main/res/values/dimens.xml | 12 - app/src/main/res/values/light_themes.xml | 2 - app/src/main/res/values/signal_styles.xml | 4 - app/src/main/res/values/strings.xml | 159 +------- app/src/main/res/values/styles.xml | 130 ------ app/src/main/res/values/text_styles.xml | 63 --- app/src/main/res/values/themes.xml | 35 -- 103 files changed, 9 insertions(+), 1344 deletions(-) delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java delete mode 100644 app/src/main/res/color-night/help_fragment_next.xml delete mode 100644 app/src/main/res/color/help_fragment_next.xml delete mode 100644 app/src/main/res/drawable-hdpi/clear_profile_avatar.webp delete mode 100644 app/src/main/res/drawable-hdpi/ic_account_box.webp delete mode 100644 app/src/main/res/drawable-hdpi/ic_close_grey600_32dp.webp delete mode 100644 app/src/main/res/drawable-hdpi/ic_launch_white_24dp.webp delete mode 100644 app/src/main/res/drawable-mdpi/clear_profile_avatar.webp delete mode 100644 app/src/main/res/drawable-mdpi/ic_account_box.webp delete mode 100644 app/src/main/res/drawable-mdpi/ic_close_grey600_32dp.webp delete mode 100644 app/src/main/res/drawable-mdpi/ic_launch_white_24dp.webp delete mode 100644 app/src/main/res/drawable-night-hdpi/ic_account_box.webp delete mode 100644 app/src/main/res/drawable-night-mdpi/ic_account_box.webp delete mode 100644 app/src/main/res/drawable-night-xhdpi/ic_account_box.webp delete mode 100644 app/src/main/res/drawable-night-xxhdpi/ic_account_box.webp delete mode 100644 app/src/main/res/drawable-night/ic_invite_circle.xml delete mode 100644 app/src/main/res/drawable-night/preference_username_background.xml delete mode 100644 app/src/main/res/drawable-night/sms_megaphone.xml delete mode 100644 app/src/main/res/drawable-v21/mediarail_button_background.xml delete mode 100644 app/src/main/res/drawable-xhdpi/clear_profile_avatar.webp delete mode 100644 app/src/main/res/drawable-xhdpi/ic_account_box.webp delete mode 100644 app/src/main/res/drawable-xhdpi/ic_close_grey600_32dp.webp delete mode 100644 app/src/main/res/drawable-xhdpi/ic_launch_white_24dp.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/clear_profile_avatar.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_account_box.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_close_grey600_32dp.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.webp delete mode 100644 app/src/main/res/drawable-xxxhdpi/clear_profile_avatar.webp delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_close_grey600_32dp.webp delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.webp delete mode 100644 app/src/main/res/drawable/ic_add_reaction_outline_24.xml delete mode 100644 app/src/main/res/drawable/ic_app_icon_signal_default_top_preview.xml delete mode 100644 app/src/main/res/drawable/ic_close_14.xml delete mode 100644 app/src/main/res/drawable/ic_group_solid_24.xml delete mode 100644 app/src/main/res/drawable/ic_invite_circle.xml delete mode 100644 app/src/main/res/drawable/ic_location_sticker.xml delete mode 100644 app/src/main/res/drawable/ic_ring_28.xml delete mode 100644 app/src/main/res/drawable/ic_send_outline_24.xml delete mode 100644 app/src/main/res/drawable/ic_switch_camera_28.xml delete mode 100644 app/src/main/res/drawable/ic_transfer_phone_outline_60.xml delete mode 100644 app/src/main/res/drawable/ic_video_off_solid_white_28.xml delete mode 100644 app/src/main/res/drawable/insight_modal_background.xml delete mode 100644 app/src/main/res/drawable/insights_cta_button_background.xml delete mode 100644 app/src/main/res/drawable/mediarail_button_background.xml delete mode 100644 app/src/main/res/drawable/message_bubble_background.xml delete mode 100644 app/src/main/res/drawable/pill.xml delete mode 100644 app/src/main/res/drawable/preference_username_background.xml delete mode 100644 app/src/main/res/drawable/registration_no_cell_service_warning_border.xml delete mode 100644 app/src/main/res/drawable/rounded_rectangle_secondary.xml delete mode 100644 app/src/main/res/drawable/sms_megaphone.xml delete mode 100644 app/src/main/res/drawable/symbol_album_24.xml delete mode 100644 app/src/main/res/drawable/symbol_archive_android_24.xml delete mode 100644 app/src/main/res/drawable/symbol_archive_android_up_24.xml delete mode 100644 app/src/main/res/drawable/symbol_bell_ring_fill_24.xml delete mode 100644 app/src/main/res/drawable/symbol_check_bold_24.xml delete mode 100644 app/src/main/res/drawable/symbol_mic_fill_24.xml delete mode 100644 app/src/main/res/drawable/symbol_payment_bold_16.xml delete mode 100644 app/src/main/res/drawable/symbol_schedulemessage_24.xml delete mode 100644 app/src/main/res/drawable/symbol_x_bold_24.xml delete mode 100644 app/src/main/res/layout/activity_app_icon_settings.xml delete mode 100644 app/src/main/res/layout/contact_selection_list_divider.xml delete mode 100644 app/src/main/res/layout/contact_selection_recyclerview_header.xml delete mode 100644 app/src/main/res/layout/load_more_header.xml delete mode 100644 app/src/main/res/layout/new_call_activity.xml delete mode 100644 app/src/main/res/layout/stories_reaction_bar_layout.xml delete mode 100644 app/src/main/res/layout/switch_compat_preference.xml delete mode 100644 app/src/main/res/menu/conversation_popup.xml delete mode 100644 app/src/main/res/menu/verify_identity.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_person_shortcut.webp delete mode 100644 app/src/main/res/mipmap-mdpi/ic_person_shortcut.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_person_shortcut.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_person_shortcut.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_person_shortcut.webp delete mode 100644 app/src/main/res/raw-night/lottie_kbs_fail.json delete mode 100644 app/src/main/res/raw-night/lottie_kbs_loading.json delete mode 100644 app/src/main/res/raw-night/lottie_kbs_success.json delete mode 100644 app/src/main/res/raw/lottie_15s_play_pause.json delete mode 100644 app/src/main/res/raw/lottie_insights_100.json delete mode 100644 app/src/main/res/raw/lottie_kbs_fail.json delete mode 100644 app/src/main/res/raw/lottie_kbs_loading.json delete mode 100644 app/src/main/res/raw/lottie_kbs_success.json delete mode 100644 app/src/main/res/raw/lottie_message_requests_splash.json delete mode 100644 app/src/main/res/values-v11/styles.xml delete mode 100644 app/src/main/res/values-v9/styles.xml diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java deleted file mode 100644 index ec2649d533..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java +++ /dev/null @@ -1,371 +0,0 @@ -package org.thoughtcrime.securesms.components.webrtc; - -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.ArgbEvaluator; -import android.animation.ObjectAnimator; -import android.content.Context; -import android.graphics.Color; -import android.os.Build; -import android.util.AttributeSet; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewGroup; -import android.view.accessibility.AccessibilityManager; -import android.view.animation.AccelerateInterpolator; -import android.view.animation.DecelerateInterpolator; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import org.signal.core.util.logging.Log; -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.util.AccessibilityUtil; -import org.thoughtcrime.securesms.util.ServiceUtil; -import org.thoughtcrime.securesms.util.ViewUtil; - -public final class WebRtcAnswerDeclineButton extends LinearLayout implements AccessibilityManager.TouchExplorationStateChangeListener { - - @SuppressWarnings("unused") - private static final String TAG = Log.tag(WebRtcAnswerDeclineButton.class); - - private static final int TOTAL_TIME = 1000; - private static final int SHAKE_TIME = 200; - - private static final int UP_TIME = (TOTAL_TIME - SHAKE_TIME) / 2; - private static final int DOWN_TIME = (TOTAL_TIME - SHAKE_TIME) / 2; - private static final int FADE_OUT_TIME = 300; - private static final int FADE_IN_TIME = 100; - private static final int SHIMMER_TOTAL = UP_TIME + SHAKE_TIME; - - private static final int ANSWER_THRESHOLD = 112; - private static final int DECLINE_THRESHOLD = 56; - - private AnswerDeclineListener listener; - @Nullable private DragToAnswer dragToAnswerListener; - private AccessibilityManager accessibilityManager; - private boolean ringAnimation; - - public WebRtcAnswerDeclineButton(Context context) { - super(context); - initialize(); - } - - public WebRtcAnswerDeclineButton(Context context, @Nullable AttributeSet attrs) { - super(context, attrs); - initialize(); - } - - public WebRtcAnswerDeclineButton(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - initialize(); - } - - private void initialize() { - setOrientation(LinearLayout.VERTICAL); - setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)); - - accessibilityManager = ServiceUtil.getAccessibilityManager(getContext()); - - createView(accessibilityManager.isTouchExplorationEnabled()); - } - - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - accessibilityManager.addTouchExplorationStateChangeListener(this); - } - - @Override - protected void onDetachedFromWindow() { - accessibilityManager.removeTouchExplorationStateChangeListener(this); - super.onDetachedFromWindow(); - } - - private void createView(boolean isTouchExplorationEnabled) { - if (isTouchExplorationEnabled) { - inflate(getContext(), R.layout.webrtc_answer_decline_button_accessible, this); - - findViewById(R.id.answer).setOnClickListener((view) -> listener.onAnswered()); - findViewById(R.id.reject).setOnClickListener((view) -> listener.onDeclined()); - } else { - inflate(getContext(), R.layout.webrtc_answer_decline_button, this); - - ImageView answer = findViewById(R.id.answer); - - dragToAnswerListener = new DragToAnswer(answer, this); - - answer.setOnTouchListener(dragToAnswerListener); - - if (ringAnimation) { - startRingingAnimation(); - } - } - } - - public void setAnswerDeclineListener(AnswerDeclineListener listener) { - this.listener = listener; - } - - public void startRingingAnimation() { - ringAnimation = true; - if (dragToAnswerListener != null) { - dragToAnswerListener.startRingingAnimation(); - } - } - - public void stopRingingAnimation() { - ringAnimation = false; - if (dragToAnswerListener != null) { - dragToAnswerListener.stopRingingAnimation(); - } - } - - @Override - public void onTouchExplorationStateChanged(boolean enabled) { - removeAllViews(); - createView(enabled); - } - - private class DragToAnswer implements View.OnTouchListener { - - private final TextView swipeUpText; - private final ImageView answer; - private final TextView swipeDownText; - - private final ImageView arrowOne; - private final ImageView arrowTwo; - private final ImageView arrowThree; - private final ImageView arrowFour; - - private float lastY; - - private boolean animating = false; - private boolean complete = false; - - private AnimatorSet animatorSet; - - private DragToAnswer(@NonNull ImageView answer, WebRtcAnswerDeclineButton view) { - this.swipeUpText = view.findViewById(R.id.swipe_up_text); - this.answer = answer; - this.swipeDownText = view.findViewById(R.id.swipe_down_text); - - this.arrowOne = view.findViewById(R.id.arrow_one); - this.arrowTwo = view.findViewById(R.id.arrow_two); - this.arrowThree = view.findViewById(R.id.arrow_three); - this.arrowFour = view.findViewById(R.id.arrow_four); - } - - private void startRingingAnimation() { - if (!animating) { - animating = true; - animateElements(0); - } - } - - private void stopRingingAnimation() { - if (animating) { - animating = false; - resetElements(); - } - } - - @Override - public boolean onTouch(View v, MotionEvent event) { - - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - resetElements(); - swipeUpText.animate().alpha(0).setDuration(200).start(); - swipeDownText.animate().alpha(0).setDuration(200).start(); - lastY = event.getRawY(); - break; - case MotionEvent.ACTION_CANCEL: - case MotionEvent.ACTION_UP: - swipeUpText.clearAnimation(); - swipeDownText.clearAnimation(); - swipeUpText.setAlpha(1); - swipeDownText.setAlpha(1); - answer.setRotation(0); - answer.getDrawable().setTint(getResources().getColor(R.color.green_600)); - answer.getBackground().setTint(Color.WHITE); - - animating = true; - animateElements(0); - break; - case MotionEvent.ACTION_MOVE: - float difference = event.getRawY() - lastY; - - float differenceThreshold; - float percentageToThreshold; - int backgroundColor; - int foregroundColor; - - if (difference <= 0) { - differenceThreshold = ViewUtil.dpToPx(getContext(), ANSWER_THRESHOLD); - percentageToThreshold = Math.min(1, (difference * -1) / differenceThreshold); - backgroundColor = (int) new ArgbEvaluator().evaluate(percentageToThreshold, getResources().getColor(R.color.green_100), getResources().getColor(R.color.green_600)); - - if (percentageToThreshold > 0.5) { - foregroundColor = Color.WHITE; - } else { - foregroundColor = getResources().getColor(R.color.green_600); - } - - answer.setTranslationY(difference); - - if (percentageToThreshold == 1 && listener != null) { - answer.setVisibility(View.INVISIBLE); - lastY = event.getRawY(); - if (!complete) { - complete = true; - listener.onAnswered(); - } - } - } else { - differenceThreshold = ViewUtil.dpToPx(getContext(), DECLINE_THRESHOLD); - percentageToThreshold = Math.min(1, difference / differenceThreshold); - backgroundColor = (int) new ArgbEvaluator().evaluate(percentageToThreshold, getResources().getColor(R.color.red_100), getResources().getColor(R.color.red_600)); - - if (percentageToThreshold > 0.5) { - foregroundColor = Color.WHITE; - } else { - foregroundColor = getResources().getColor(R.color.green_600); - } - - answer.setRotation(135 * percentageToThreshold); - - if (percentageToThreshold == 1 && listener != null) { - answer.setVisibility(View.INVISIBLE); - lastY = event.getRawY(); - - if (!complete) { - complete = true; - listener.onDeclined(); - } - } - } - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - answer.getBackground().setTint(backgroundColor); - answer.getDrawable().setTint(foregroundColor); - } - - break; - } - - return true; - } - - private void animateElements(int delay) { - if (AccessibilityUtil.areAnimationsDisabled(getContext())) return; - - ObjectAnimator fabUp = getUpAnimation(answer); - ObjectAnimator fabDown = getDownAnimation(answer); - ObjectAnimator fabShake = getShakeAnimation(answer); - - animatorSet = new AnimatorSet(); - animatorSet.play(fabUp).with(getUpAnimation(swipeUpText)); - animatorSet.play(fabShake).after(fabUp); - animatorSet.play(fabDown).with(getDownAnimation(swipeUpText)).after(fabShake); - - animatorSet.play(getFadeOut(swipeDownText)).with(fabUp); - animatorSet.play(getFadeIn(swipeDownText)).after(fabDown); - - animatorSet.play(getShimmer(arrowFour, arrowThree, arrowTwo, arrowOne)); - - animatorSet.addListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - } - - @Override - public void onAnimationEnd(Animator animation) { - if (animating) animateElements(1000); - } - - @Override - public void onAnimationCancel(Animator animation) {} - @Override - public void onAnimationRepeat(Animator animation) {} - }); - - animatorSet.setStartDelay(delay); - animatorSet.start(); - } - - private void resetElements() { - animating = false; - complete = false; - - if (animatorSet != null) animatorSet.cancel(); - - swipeUpText.setTranslationY(0); - answer.setTranslationY(0); - swipeDownText.setAlpha(1); - } - } - - private static Animator getShimmer(View... targets) { - AnimatorSet animatorSet = new AnimatorSet(); - int evenDuration = SHIMMER_TOTAL / targets.length; - int interval = 75; - - for (int i=0;i handleArchive(id, false))); + items.add(new ActionItem(R.drawable.symbol_archive_up_24, getResources().getString(R.string.ConversationListFragment_unarchive), () -> handleArchive(id, false))); } else { - items.add(new ActionItem(R.drawable.symbol_archive_android_24, getResources().getString(R.string.ConversationListFragment_archive), () -> handleArchive(id, false))); + items.add(new ActionItem(R.drawable.symbol_archive_24, getResources().getString(R.string.ConversationListFragment_archive), () -> handleArchive(id, false))); } items.add(new ActionItem(R.drawable.symbol_trash_24, getResources().getString(R.string.ConversationListFragment_delete), () -> handleDelete(id))); @@ -1553,9 +1553,9 @@ private void updateMultiSelectState() { } if (isArchived()) { - items.add(new ActionItem(R.drawable.symbol_archive_android_up_24, getResources().getString(R.string.ConversationListFragment_unarchive), () -> handleArchive(selectionIds, true))); + items.add(new ActionItem(R.drawable.symbol_archive_up_24, getResources().getString(R.string.ConversationListFragment_unarchive), () -> handleArchive(selectionIds, true))); } else { - items.add(new ActionItem(R.drawable.symbol_archive_android_24, getResources().getString(R.string.ConversationListFragment_archive), () -> handleArchive(selectionIds, true))); + items.add(new ActionItem(R.drawable.symbol_archive_24, getResources().getString(R.string.ConversationListFragment_archive), () -> handleArchive(selectionIds, true))); } items.add(new ActionItem(R.drawable.symbol_trash_24, getResources().getString(R.string.ConversationListFragment_delete), () -> handleDelete(selectionIds))); @@ -1584,7 +1584,7 @@ protected Toolbar getToolbar(@NonNull View rootView) { } protected @DrawableRes int getArchiveIconRes() { - return R.drawable.symbol_archive_android_24; + return R.drawable.symbol_archive_24; } @WorkerThread diff --git a/app/src/main/res/color-night/help_fragment_next.xml b/app/src/main/res/color-night/help_fragment_next.xml deleted file mode 100644 index 8fd6e060b1..0000000000 --- a/app/src/main/res/color-night/help_fragment_next.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/color/help_fragment_next.xml b/app/src/main/res/color/help_fragment_next.xml deleted file mode 100644 index 84421ed12b..0000000000 --- a/app/src/main/res/color/help_fragment_next.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/clear_profile_avatar.webp b/app/src/main/res/drawable-hdpi/clear_profile_avatar.webp deleted file mode 100644 index 5e8f2924064d133376861dc8dc3692d425708385..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcmV;10(t#XNk&F~0ssJ4MM6+kP&iC+0ssInN5Byf_v0v%ZCB|}Ug8D+9uR;5wmIE< zj}5nxBq>rJlNTQ^z4ZRO#M<$-gGiDTDdYT`JORuPGYz-4ZPm)$-`#&7l6ePz{EVU~ zhAK3JJ_ud!3qTMA5e1dP7;OYWP(v3j1dTrHDI%hLMT|1q-R$cT@vv%Tv}olgqWs)V zTDh70eEfYxT#Z^OKTn(X7u?K7X@3#r=Vdoq1Tk8)(NexmOe$XRC!itzLPHRQoa7)E z!oRZIbEEVyhf#Jx5ErP#=gdyMcwTtTZWJOQO2o>}T(X=V=W?6XIYdy(aw@a>sh`_^ z4b#iNuRTvMHt=j7*GG^y6taQSnkUc819(i9K?r=F>>_nv;nq+0wpC8hOcjpGs?HT*gn{mv|zO9+UG^ z_CJ-@^n_BtfH<{LFW*?5NRvW_M5zwi_=ju7nUGO9v0DcO&35lLcHWlNGnRfSsuPbF2Xz$u!mFhLh9jr+V}`m@Rs zv{5U<@Y9(RGWb*=JtJhK`H8e<7KAJ&T2oH}TRJwBJABj%{b;(S^$Gr`=Zp$9AGWP| znC)u&r#{m;f3Mjh{BI4`&Gpr_WdK+KKm#OYpQ* uYy#E@xW+5L6ga2+bY2EO;Ql^Dzt)Yy1=mw(arRl<$;5%#UBz5l6aJ-b+H4L0 diff --git a/app/src/main/res/drawable-hdpi/ic_close_grey600_32dp.webp b/app/src/main/res/drawable-hdpi/ic_close_grey600_32dp.webp deleted file mode 100644 index 4d421ff9bdc0093159bfc649d5a77875dd5c759b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmV- diff --git a/app/src/main/res/drawable-hdpi/ic_launch_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_launch_white_24dp.webp deleted file mode 100644 index 00fb672ba6c16833f8da9839e1b5bb36ad43a15b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmV;_04x7eNk&G@00012MM6+kP&iD$0000lBftm{&oKY3fWJz=%` O3?OBgY=fx<{HFj|+gT+5 diff --git a/app/src/main/res/drawable-mdpi/clear_profile_avatar.webp b/app/src/main/res/drawable-mdpi/clear_profile_avatar.webp deleted file mode 100644 index 4b988a5f0f7514e91ca817291a90c4f1dafbbd4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmV+*0^j{oNk&E(0ssJ4MM6+kP&iBs0ssInFTe{BFXO0@BuC1gWwJ<)KaG2N@9(Np z%ffAJ+p4m@MV}5Jr8!Dw2sLuId)!Ep1 zQIHv`DE=A z(fiY-8s0&C7Mq_VrfgHOHA+2_D*;d?kn0<=F`E03BBrYJg zdMQ4eYB;K7iy-G*^-9#tF3L7igGp0P+qqV#sLk~omIEmpxArE20RX**VqXA2a9ZD( z-_YtG|2k&EA+4Cz2V}IuR9Cb|Bh!Qojr{E*OcT)&qZ#S2*Evdqc$b~-L{>{#0h2>X z<>9HU%C*&bMMXd7syAkz;%+HdDinze$Zy<>_a;c!$8tW$#Nd@vw-jd1my@lvb&xVP i&t9DtV7Kq-;gR^^+2@wRn%_KLa=b~Q{C-Rh(Jld2?gkeB;4<-){KR5YxjhKX7_tf{5FFKvMX w4y7E(I2H($Sb$>=rNPF9#-Xh~#_Y0+`dEO$1USq?&cE|E&;$5?IQmb&h_N16J^%m! diff --git a/app/src/main/res/drawable-mdpi/ic_launch_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_launch_white_24dp.webp deleted file mode 100644 index 612990e0c325598802a983e8a093f7c39eed1299..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0BiqJNk&GD00012MM6+kP&iD00000l7r+G&k1+r9KmTeQNpZuRNr@1(5WNk= z6NCW}0|EG0005x?01XC>Bq^F>hVd`=@IgRC|0e){>Ko?(=d;FJBz8@?WD4^YQ<(J) zQ_10gEhfxxZZ=Q@w;%(athXFmy6 Ck2&`M diff --git a/app/src/main/res/drawable-night-hdpi/ic_account_box.webp b/app/src/main/res/drawable-night-hdpi/ic_account_box.webp deleted file mode 100644 index 2891df267cea80f2c0f3a60c95a52325402d42e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmV+%0ptEsNk&E#0RRA3MM6+kP&iBn0RR9mFTe{Bw?U9?Q-A4ars zPP^wD8rdK1I-3+ZVL6QJB~uVlUaIp!-Lz^6u*JEWOG6V+Yt3B2sZ3HUEU!kA3wgFI iM;=LkAF5w#k6{ZNVd%kvwYrrHBX6)%v+cX|F9iU2?R8-Q diff --git a/app/src/main/res/drawable-night-mdpi/ic_account_box.webp b/app/src/main/res/drawable-night-mdpi/ic_account_box.webp deleted file mode 100644 index 7c9f3beee48ed1da02364403898eb480cbe9c353..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmV<403rWUNk&H200012MM6+kP&iD=0000lAHW9?cVQrHoA@`q?Kd(1^RK9pBsI8v z%;4ePr#1i?2Fa$}0mukM1dbr!J`fFvcLlgN10U|UYzHu!_fBqS@k>ohK zRkfGH_aIziWB|Yd4in)(*dTb=0faapUH~C(fWScn5kmOzK!5;#006)X!9gql0t5g+ z0FWF>QY7UtGcz+Y&n!0m|4FN^&dB9cME@DMZKTLO#@#)91N|c;x4df>B-(9}anv_- z3mC2LpwDU+H1BD(wFS;f?SXbxGto>n3!bmxFib@v>ETg|*74AXc>1~st!!7QiYB3D zU#hl%z1zN2o+DmYRjdJCLRG9ZUQku65MF=_Ka;{6s){wjlRuFBeG7kX@Xsymy^-{K zQv&Y|OnyVm?YxL)JG2En;8(NA~8}r z13brxmBb6*n3$RHMY&>pE-p78vGZwt1JAAef1CV&qx^rX{C~6je>+ib`GlH!T4d-S EA;&4C&j0`b diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_account_box.webp b/app/src/main/res/drawable-night-xxhdpi/ic_account_box.webp deleted file mode 100644 index e937300bb78652dd2e92241ca2c3de3a295f5997..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 490 zcmV8^-)e?+?TL&p*SqZ5-#0 z_TBfA7%?~q00Mv_fE$I23jnaN0U)?>px7|+;>SYa!-oKh-~zyn04@N)0%QOaP!s?K z6aY~`v~9bPl(y}$ZQHh0Q~&=ZJ^hm0u_}2H{ht8w<7o55{*|k(*&AQvm`fwDf$~Y2K z$+uI9s)D1Jst?C3)dG&w01cnv;31k}26CRHNL?V|jX-0;Ef)%p`x^02G8kTqzbvuN zaQJE@S}!(o?E+%HnCmV?tk*Mt>B`nd;V(PR@y^DoXLr~DdfFcCZ;gn$wzYqB+XHej z)tfMc)|8R)Jxz9UMp@p~VlN{U z&g^UOSQSb)v3j#Y@j3N6RO?hPrCM4&qx{E{-XAyjC~oNvQS8%=qZp%WdB)(>=*$v^ gc_A^piC`lv!`N9zH!~d)lA9+E9`vzhyh;2x3d#HHZvX%Q diff --git a/app/src/main/res/drawable-night/ic_invite_circle.xml b/app/src/main/res/drawable-night/ic_invite_circle.xml deleted file mode 100644 index 1e46e333d7..0000000000 --- a/app/src/main/res/drawable-night/ic_invite_circle.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable-night/preference_username_background.xml b/app/src/main/res/drawable-night/preference_username_background.xml deleted file mode 100644 index 9129a90e53..0000000000 --- a/app/src/main/res/drawable-night/preference_username_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-night/sms_megaphone.xml b/app/src/main/res/drawable-night/sms_megaphone.xml deleted file mode 100644 index 4ee39d0ece..0000000000 --- a/app/src/main/res/drawable-night/sms_megaphone.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable-v21/mediarail_button_background.xml b/app/src/main/res/drawable-v21/mediarail_button_background.xml deleted file mode 100644 index 777372d475..0000000000 --- a/app/src/main/res/drawable-v21/mediarail_button_background.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable-xhdpi/clear_profile_avatar.webp b/app/src/main/res/drawable-xhdpi/clear_profile_avatar.webp deleted file mode 100644 index 1192e99cbefd543af98595f4d84b68d005b93752..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 836 zcmV-K1H1fENk&FI0{{S5MM6+kP&iC50{{RoU%(d-Z{;|WBuA;aLpgwHSk6~}`JZB$ zso1~?x3O)j%KCy6kI2mP7;gF^G8H2p6%B|rcM z27eNV7yOSI0usUF(#+p`w; zO|9}G9xpb=zeWBzLWU@+k3@8P6|^*Ux@_FvYt2^X!`Me5VcYhCZj#!zZO&e8%&hHp zw!O|f#R+59drbY+* z2MlOy^ypLLA6_VB*z00CR9ON9YYQ@6#?7PSuLi|h}CNr0~nAcfU<}Q1Qd7npR_NupXtMYRN z3)UdBGCf*2a}6phQllkitcJF>taS0>v}marC8dj(t%I;MMk^e<>{kTH-x3=Yg_NNv zq-aI|=O#{#L`W%Wq(jP9BL~v*Bo&fZK{BQBo=YgN0%a;PVm)KBmQ(>V>njR#<>wVu zZm0qW@@p_BiziAMEPrYs8_wZ|kk#c_tS4 z=tyT@O=}x?+f1D&p9WnQgY+5b;a^A1o3MkQ_-;B;_zOGc)t#RQ~^Eqsp$RSv*Dbe*)+qVPSD% zf#lOXA4ro0m>U5USfHPI-Acfhx-;5QXV8pJ;J=35AeT($2RmQ58>YA6K6}9xvaGTX zZL;oounpOTcX(Y=_VKcsJYGx_|9Y~T9Ns`P#M_4K!aF=^+jYbPuGm!B2jOn`UAWKU zg~)D@i$rpRodk;E_7}u#X02j6kw_QYv#o)OZb*j>t1+Fi(1$Q?QVe7K*-pc&m6?WkL!Ep-LPdggW1WF&4- OkcGts=OR}Tr`WQ zo+Fot{yTEp$dS4zpiZ+nyg|Ry^n=h0z36Or9m%~Kj&m2A?Jk8Fj#8Kq5TfQy_|?o z-sr#pS6Bcv193sv5F8*7ijTGf;(#rN!}<%>V%NCxfn;UdMF1*_HnwXBPq?0b8(ywk#pAgjhl>w&xZ!A%PGg zB6>n)1VVz+1_nYLA^I^P5}8414FfKNRhPlEr=pdGO1ouR!VLI{9%-2S*xBJQwz%qD Q=4h7FUE8}K=J=Ne0JlnC0{{R3 diff --git a/app/src/main/res/drawable-xxhdpi/clear_profile_avatar.webp b/app/src/main/res/drawable-xxhdpi/clear_profile_avatar.webp deleted file mode 100644 index 9521c5f168f0b2f2f9f0ab7766fb9d4b8433f7b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1242 zcmV<01SR`YNk&G}1ONb6MM6+kP&iD*1ONapkH8}k?*~beBu7zH55|!jS3beV`Id&& zqN_5kd&L{z*0!yxn%9t!5HeDl`2APn?sD%rj2lUEQisVuQN+u`8mQH_EpP4*!;#G3 zav~!$L>J%@>bgvIS76pmidixD`~O#A+qO;8J$VNJ>fZ!C4S&~1f&~X|-Xk4>RAg+8 zHE68)bYX=Ql1O6B6i6`;DM%kB_;T~*VK}5nAI~?WLBaw5gJM0>JUg}xzme{u6KDq;5E=#^A>{Jo;wFk;3IQLSdC^|_`QX>VL6rgr zOM>FtONs=1vv?9Dak36S1el&3qfDY@`X`v$sZ5sCfBG%+$)^`2b%@22$zd$k&z?e}Z zM^j$rV*nsS5Vs*?#JI6tI(4ReCkf;c8R)hEI1JC}0AOGtK+Z69n;3_o9YCAjy$1t1 zK!?=9=r*AYG^_*YQkmHe`rkqsMEuc`><&84&~ALX!cRHA zLpocueQu~O5%9-bvO08UOLxP~W7yw#e#)g?4L#T*b(p?KdC7QJRm-%j>Dgh*Zq;Q1 z>h(JIOx~*|AZa$RXrJZ^iH$5e@J(eZu$uYv8M#1xftgaHW^{nj6B@86rFv8V!MM5% zsumSMG`=?N+P2Jf)yM$CakZpex1&py_}JWr1`rQ}+$PkbOXc7I(T7z1vqR&O#YJDL zDP8FOgDbhcXp?DGv5;sh(yDlXX!-yD{dZRhT9pz{8CsPWPbFH_5KUl1TD6WBOHvzJ zrIZd7M^M>RTJh$2#F4iZy?BiXF~rp46icZdC%nWuoMxOiD;gdsBpy+$MJnZZa-(vE z3+5B3T%z&4wUizt9?M@KDA8cPt>YdJzUfMn@p4)!J1k_*McTMY+-isBW z?Xc*O`&TsymE}v%ZS(r;dH0?SdmMQ|EFtvN_b#VF20fr7N>^Ec0VXxPA zrV2z5t1X?L`n=h`cIATEb16S({;G95-}*dtvQ%RdpwQU3KKH(J_xYU49XKikx#E3iwuGW~DTgaAFmt~MNY9$6FNDK;@GfC7_E;EC%%p8uY{jVy`m-Nb{AJP8_pdUx) zlbfz~)?X)crlMSF$9)zVk#i03EHZJRAr=PapE0O8zFdP$`EF5M^9@l9_%zH9t9G$E z+w`-mMF-Q}MnGc&xdU`kr5DR7oFt$LgA~kRKobW?P@ZbUSZ^cQ^sHMz9zq^@#E}ql zhGUIu9mh1+42~*S?d>$fHH%}7YaK_s5i+3mZe@)lVrxpL-ykt|&jM=o35TDfxK zxW&7&3HSF`&e>}PUaWh0Q;JZa}!oH;GVdb*xI5k5s!9@6n@aybfCGFWfDSw$ z)B?DXY|Bm#t4#<$1YBkC)73hCyUF#2AYh;}HW~Vt`FVY$Dtv<0!D!rYi(K`uRt@4z;f!Yt*_$AY+GF~jr7vBV*ek;d22S}yiND6n+Nk| zV=!+nM&s;aG|nEfFmjNEk%2Vp45V3CM~TuZN|aVnqO^(^vpV$-SSJ8rAUp^HNC*f21Av}?0@{ZKZbHFrBuR?2aL>#*{yTcmu+m8p z{fFSTkt2zQHs{^DN2ED&Wp()kw$vN?l8`N)5fKe2L~5&O#kCpVW+1NzUpcg4EVHSc zrt%qU?=@OhBT81~IF=fb8j%{29+3f&fFJ`RpK?MXMo>qPN05ip2Q!3X5|YTm%n(0e2*?+E9=`&dCBj(%xR7s0FhmJvj6}9 diff --git a/app/src/main/res/drawable-xxxhdpi/clear_profile_avatar.webp b/app/src/main/res/drawable-xxxhdpi/clear_profile_avatar.webp deleted file mode 100644 index 015fcf809b3a7ef6c8f487882bde3f41f99cc97c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1736 zcmV;(1~>UqNk&G%1^@t8MM6+kP&iDq1^@srzrZgL-cZoCk>leJ`^Sxc01+_(Vm>n1 zMfwnhRLxgmX;t>Fvj0js+}b2<i^EW5xI_+^^W+Y> z4Cgng3MW4^j~P3RBbjluP%Cq5$qWP0uO)L^D`S_Tv6+qP}n#<|Bq+eU)q%w3rutf%pO;M}%t>KUJH#97iT)hFzG!bp=LM&CIX=;eCG@SG4F@#&>|8x}5V4Q04}8 zE8Fijwry4UXzDH*6+j9RvAcUi?hY|kxRX+VyZf2x{{+xa+XO~=kJ08ZdV(>O-&PC? zCTJ^?CKlU*LI~Q3h~_Z0U>>uWm-08eL_}=?I$%_fXcmi~$p$3bmFz__jbsMN^osvQ zGVSFRd#@9D9YB_pIjNJ40!Af~;07g=k? zk1nDjB9CY$8?d%Z3Zx{^MnOm+=`&Ja2PP5c^`47HOQTKl_o)|h)3MPMr8&w-T!p(XiGh%LDQ-~vz~0u{qy zH#WgWk~h0oM;3`ch_Csa6wlpF!ffg82-?ddQMR($Avs_B8j4(wBFVWbAn*0vCbt0C-J3qV?sS1evR<<||NDXWovJwdzG5JOo@_ z)zm4bkTkTaz~%=a^4cTcq@l_Rfd7Os+%BYaZDei-5PfP{>U>ZzD$;olAi>+4KgE)+ z@FoG0e2nVV6osOt#}^I&iB7Ld91p~)$q&M&tAn#!fMll@g_Z|_RU|5W>c&({R?v>} z`V%1Gm1|q!Owh)pM@dCI2|#-NRbY;lg6i*}JfKR`8LDamp!(DQe)``}|BLzHv6^Pq zn0!cosA+71$p`dyiXt0lyCgUV}2jj&}0>kPx0t$>6tWfO?c~z#ZIAxi866| zn^<&KbPTH4C7+yc|1n4$IiyS$dsROeOw8O0CXDZX*B08wyQkrlF=_lYcirPcS~?H) z%iMY<6US^7<{R%*hq6e#jSTCe5v_^K68`d{^E-7?FzVfFo;bH>w2P90R!{Q8^hbP) z?#*Z!w_kC?#qgE`HURJ4IG*Cqht(7D2d(pdUUdgY%WZ%>*0;St9NAPGxzlW zOGB42kg2Q!kO5eN3Rh6#b<&Yp&|4wbG_9nEnVoQvQk1Zi$3mKY6 z`fq6Md0I)!Zw6h9BeUR>Wl-UIasH|b0F_X(3%~*p9NG_ZoE=?0RYzuij?DarO21*x z*gXZWxIIO$dR(dMUvsn+ZMY2}0Z={yumP~^DFHYuztpqy-lN}6+};owCcJE1044yZ@5JTb z0L->LQvR0q-!7l%J6m=Q6KXb5Ib3yn+fo4W&6_6_o=hf}Zo9oIEJub3JF{`4N_oSE eQ1K@l%9Y49%v6BP#u!%vjWNtrxU7NnV;2Eg)Js+X diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_grey600_32dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_close_grey600_32dp.webp deleted file mode 100644 index c1431deff98a38742dac3dc07b7bd94554b34a7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 404 zcmV;F0c-wJNk&GD0RRA3MM6+kP&iD00RR9mf50CQXJDpn8@F%Sj=wY-X4AG&vgX_V z4>g;%jgmFr_J62?06-Gz3hy|`AZtKp0DyO=Nu=#gQvW}o;NrtEw;9~j+V&&tbbSY@ZTj894uij-8WFDWU=PARD&gp@FiZfvTg6ilm8(rHz87kG(yu>?!JH zA5(%|ssuY+8MezpY_)|LZJ-!&tNXr=^#g3}eG4!~bFs2qZnG22hyrGmfEiK1j1n;U z2A|+p;dg{TxA=R*zqj~zga2;f-%b9zjsG|J{}%q=5dats;S2*k7yx%VYA_%GM{Xo3Qq3$gGjIL> zl|xmTdD}fi^dFMjMv^4D)O+{jX&zyJD=SjVop-#sy*;(&`I2W#tiSd2$oePGj|}kG z$;J*C*~S4QyE$NFZwHJlbFTE}PjM}&YDrX;v?^)sJrs2`6V#RI=}b>|assJ|Bqo%W zSW<#1i6*3@De~Mf@nj@Yk;y)d#ZQcp2`~_97~CMp0nh_z?M^9=Uz$KkkhuRhFj0YG zLPZ3N2Nw-6n)W7^8VNKGY!u))_Ru&6M`Waz2S;GWQC+Z%q`FWUiw$k|78<80#+TUuhhqYLa%TI$-+-~291OK!Bfyqvbzc`>xVqX7W> C3!VD_ diff --git a/app/src/main/res/drawable/ic_add_reaction_outline_24.xml b/app/src/main/res/drawable/ic_add_reaction_outline_24.xml deleted file mode 100644 index 455fcddb06..0000000000 --- a/app/src/main/res/drawable/ic_add_reaction_outline_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_app_icon_signal_default_top_preview.xml b/app/src/main/res/drawable/ic_app_icon_signal_default_top_preview.xml deleted file mode 100644 index b2d822b2f8..0000000000 --- a/app/src/main/res/drawable/ic_app_icon_signal_default_top_preview.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_close_14.xml b/app/src/main/res/drawable/ic_close_14.xml deleted file mode 100644 index 14f37e2d83..0000000000 --- a/app/src/main/res/drawable/ic_close_14.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_group_solid_24.xml b/app/src/main/res/drawable/ic_group_solid_24.xml deleted file mode 100644 index 5d7e9219ed..0000000000 --- a/app/src/main/res/drawable/ic_group_solid_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_invite_circle.xml b/app/src/main/res/drawable/ic_invite_circle.xml deleted file mode 100644 index 5e6384a813..0000000000 --- a/app/src/main/res/drawable/ic_invite_circle.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location_sticker.xml b/app/src/main/res/drawable/ic_location_sticker.xml deleted file mode 100644 index b920d656f6..0000000000 --- a/app/src/main/res/drawable/ic_location_sticker.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_ring_28.xml b/app/src/main/res/drawable/ic_ring_28.xml deleted file mode 100644 index 1020b0d922..0000000000 --- a/app/src/main/res/drawable/ic_ring_28.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_send_outline_24.xml b/app/src/main/res/drawable/ic_send_outline_24.xml deleted file mode 100644 index 7187556fe4..0000000000 --- a/app/src/main/res/drawable/ic_send_outline_24.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_switch_camera_28.xml b/app/src/main/res/drawable/ic_switch_camera_28.xml deleted file mode 100644 index 5d861fbcb3..0000000000 --- a/app/src/main/res/drawable/ic_switch_camera_28.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_transfer_phone_outline_60.xml b/app/src/main/res/drawable/ic_transfer_phone_outline_60.xml deleted file mode 100644 index ebb5e6af46..0000000000 --- a/app/src/main/res/drawable/ic_transfer_phone_outline_60.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_video_off_solid_white_28.xml b/app/src/main/res/drawable/ic_video_off_solid_white_28.xml deleted file mode 100644 index 90edf9003b..0000000000 --- a/app/src/main/res/drawable/ic_video_off_solid_white_28.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/insight_modal_background.xml b/app/src/main/res/drawable/insight_modal_background.xml deleted file mode 100644 index 689e96b8d1..0000000000 --- a/app/src/main/res/drawable/insight_modal_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/insights_cta_button_background.xml b/app/src/main/res/drawable/insights_cta_button_background.xml deleted file mode 100644 index 8992c530ee..0000000000 --- a/app/src/main/res/drawable/insights_cta_button_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/mediarail_button_background.xml b/app/src/main/res/drawable/mediarail_button_background.xml deleted file mode 100644 index 85e1a959b5..0000000000 --- a/app/src/main/res/drawable/mediarail_button_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/message_bubble_background.xml b/app/src/main/res/drawable/message_bubble_background.xml deleted file mode 100644 index c21dab9d39..0000000000 --- a/app/src/main/res/drawable/message_bubble_background.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/pill.xml b/app/src/main/res/drawable/pill.xml deleted file mode 100644 index febeaab9f7..0000000000 --- a/app/src/main/res/drawable/pill.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/preference_username_background.xml b/app/src/main/res/drawable/preference_username_background.xml deleted file mode 100644 index 11e0349e88..0000000000 --- a/app/src/main/res/drawable/preference_username_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/registration_no_cell_service_warning_border.xml b/app/src/main/res/drawable/registration_no_cell_service_warning_border.xml deleted file mode 100644 index f447a27c6b..0000000000 --- a/app/src/main/res/drawable/registration_no_cell_service_warning_border.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/rounded_rectangle_secondary.xml b/app/src/main/res/drawable/rounded_rectangle_secondary.xml deleted file mode 100644 index 38a0cfeb90..0000000000 --- a/app/src/main/res/drawable/rounded_rectangle_secondary.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/sms_megaphone.xml b/app/src/main/res/drawable/sms_megaphone.xml deleted file mode 100644 index b0eadff7ce..0000000000 --- a/app/src/main/res/drawable/sms_megaphone.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/symbol_album_24.xml b/app/src/main/res/drawable/symbol_album_24.xml deleted file mode 100644 index 80cc206dec..0000000000 --- a/app/src/main/res/drawable/symbol_album_24.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/symbol_archive_android_24.xml b/app/src/main/res/drawable/symbol_archive_android_24.xml deleted file mode 100644 index 850a47c11d..0000000000 --- a/app/src/main/res/drawable/symbol_archive_android_24.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/symbol_archive_android_up_24.xml b/app/src/main/res/drawable/symbol_archive_android_up_24.xml deleted file mode 100644 index 06f2e10575..0000000000 --- a/app/src/main/res/drawable/symbol_archive_android_up_24.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/symbol_bell_ring_fill_24.xml b/app/src/main/res/drawable/symbol_bell_ring_fill_24.xml deleted file mode 100644 index 33960fd837..0000000000 --- a/app/src/main/res/drawable/symbol_bell_ring_fill_24.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/symbol_check_bold_24.xml b/app/src/main/res/drawable/symbol_check_bold_24.xml deleted file mode 100644 index 90257afa8d..0000000000 --- a/app/src/main/res/drawable/symbol_check_bold_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/symbol_mic_fill_24.xml b/app/src/main/res/drawable/symbol_mic_fill_24.xml deleted file mode 100644 index 422c3e0fd8..0000000000 --- a/app/src/main/res/drawable/symbol_mic_fill_24.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/symbol_payment_bold_16.xml b/app/src/main/res/drawable/symbol_payment_bold_16.xml deleted file mode 100644 index 56f8ffb185..0000000000 --- a/app/src/main/res/drawable/symbol_payment_bold_16.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/symbol_schedulemessage_24.xml b/app/src/main/res/drawable/symbol_schedulemessage_24.xml deleted file mode 100644 index d007e77aec..0000000000 --- a/app/src/main/res/drawable/symbol_schedulemessage_24.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/symbol_x_bold_24.xml b/app/src/main/res/drawable/symbol_x_bold_24.xml deleted file mode 100644 index e993fa7705..0000000000 --- a/app/src/main/res/drawable/symbol_x_bold_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_app_icon_settings.xml b/app/src/main/res/layout/activity_app_icon_settings.xml deleted file mode 100644 index f7b8965584..0000000000 --- a/app/src/main/res/layout/activity_app_icon_settings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/app/src/main/res/layout/base_kbs_pin_fragment.xml b/app/src/main/res/layout/base_kbs_pin_fragment.xml index 10b6ba8271..1af9824a34 100644 --- a/app/src/main/res/layout/base_kbs_pin_fragment.xml +++ b/app/src/main/res/layout/base_kbs_pin_fragment.xml @@ -74,16 +74,6 @@ tools:text="1234567890" /> - - - diff --git a/app/src/main/res/layout/contact_selection_recyclerview_header.xml b/app/src/main/res/layout/contact_selection_recyclerview_header.xml deleted file mode 100644 index 22707a2384..0000000000 --- a/app/src/main/res/layout/contact_selection_recyclerview_header.xml +++ /dev/null @@ -1,10 +0,0 @@ - - diff --git a/app/src/main/res/layout/load_more_header.xml b/app/src/main/res/layout/load_more_header.xml deleted file mode 100644 index 816fbac82b..0000000000 --- a/app/src/main/res/layout/load_more_header.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/new_call_activity.xml b/app/src/main/res/layout/new_call_activity.xml deleted file mode 100644 index 77d9ef65f8..0000000000 --- a/app/src/main/res/layout/new_call_activity.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/signal_bottom_action_bar_item.xml b/app/src/main/res/layout/signal_bottom_action_bar_item.xml index 9924e87610..0332157926 100644 --- a/app/src/main/res/layout/signal_bottom_action_bar_item.xml +++ b/app/src/main/res/layout/signal_bottom_action_bar_item.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="4dp" app:tint="@color/signal_colorOnSurface" - tools:src="@drawable/symbol_archive_android_24"/> + tools:src="@drawable/symbol_archive_24"/> + tools:src="@drawable/symbol_archive_24" /> - - - - diff --git a/app/src/main/res/layout/switch_compat_preference.xml b/app/src/main/res/layout/switch_compat_preference.xml deleted file mode 100644 index bfeeedb9e5..0000000000 --- a/app/src/main/res/layout/switch_compat_preference.xml +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/app/src/main/res/menu/conversation_popup.xml b/app/src/main/res/menu/conversation_popup.xml deleted file mode 100644 index 148ba35f0f..0000000000 --- a/app/src/main/res/menu/conversation_popup.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/app/src/main/res/menu/verify_identity.xml b/app/src/main/res/menu/verify_identity.xml deleted file mode 100644 index a98bfbe007..0000000000 --- a/app/src/main/res/menu/verify_identity.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/app/src/main/res/mipmap-hdpi/ic_person_shortcut.webp b/app/src/main/res/mipmap-hdpi/ic_person_shortcut.webp deleted file mode 100644 index 5cfcf2b46baa085093820d118f38ed5211a9f078..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2096 zcmV-02+#LYNk&E}2mk@K49xlh5S|9aq}X*!FDbXcI>Q0FcT4 zf3m%7+qUau+jb5E03cdL*|wW)+cs1G8Mtj5$A$s-*rr{dpu_B+8qN7t#~kQWF()Oq z%*@m>Gcz+od$}sqGBY#dhr9l8(e{kA_RfySQtFXXG4nB1S22&=g&9|)Xu`~#ShrGy zBnSY=Mw+f|+qP}nwr##_+qP}<@LJopy&E`i+cuJ(OS=3Vsen3nWy`4@r$O8o_%prxy6WO$LsyGBLT!MNlT_%>?=m64(Z1U|4*P;nZ z4P!2f9O;0*l1r&)6LG-yC>a;B^$mpsOTWoZ)_Z%jz^Nk1#FI}g#KGC3>nMXQ8B5w3 zroUQ{kv&-_rvk;@&;oV$EFJz~s)XGwEmU%NmmKdf38nE`u5mS<&r-SbW0Z_)bbDQg;_H?VP)czPi@VF&Zwde= zf8fBKtQ^>hnMSa066~48CEDd3xBo^?{2+x0=3ZRJUt-e{SS<e-alP3xUC!U%=-+@ilwSt`&bkf$SUN z|F}eJ`~%bI+~?DT8MC;hMDsa#!(H@;Rl%H*J{oRWOZTn=OT=rb|Eri2Xzd-&V$}mv zm|ZnQ1DGw*d954~?}uLOMHf-`nEcOKEId2}9g{v1`Z*UwJo0{*ciGP}n2DsmoW(p$ zo7L4LY;Nn~!d`hH;!SRt#vPTp)}Ckn)KsnYUbEiW${otYQZ#~kX+kE7$sF$oo3WsiT8RQ-h+|wMO*u)>| zIWY}WwY=>Xv@+S%VrIFNSt?~!iuuiKY1^xt=-qo};tR>ZySp2tap83f+{@y4TTTAJ z_Kk4qVcOctS4-|`N`H)ruK^zDW8r^pg#S#auQ~g&k#4TKeM-L8ypkt=5S8$X^r5}I z_hTy98_n1Ay^NI1na>Our3_`&{~W4^isL|$c()a%FjfgQ#^sM z3IJmp;nZd6M&n<&W@!Gi5+C|lc)Y0Av~KFYubqCj~q zminoZg@zt@M5u4Uz2HBn4~Izfpa?{?3Gv_1OrLvLkElWw_pQ6y+opaKaJhl^8b!|W*x!Q0lQCS-!{U2GNKE{V$%VW!ymcLJkFW9-avM^@d0EI-`K={ z@}nX>FaslT4v<69evSo-8Qs(iYVYIRx4N}b=7m|v-#yoAC1&weM$Wn;ikW`fLhB{v zM*?la6}8Ml{;oMWa241|dqOdBqri#sXQ7QgPo>Qa28m=hyw1YlKfa2TY zJ9v8f%L|-eMkRme92_gL1B56SxUOX`cHhy(v&|KnP8gNqQf(LAfwi;#I5)S$*jamY z(wzjKunq}~5yf3yFD)g0+iawT8{Mlw^~>+O*wvqWE-s%ZulD!*5d=Vyl5>D& zTl1Ud^1q^z2X6kmjUAXC@P%&x`-Mg1&#caTi%IVHysjlwfA@uZya)0&+&xngcMcHv zl93A}?vKyuAo%ZNy#qu_1GJ%!tfBL2^4@`i<-z3Bxy@@Efvtbhtp+d#&V*_BHnTdT ztNzV}`IiW6eVo(3q2071qkuow$iSLsKma=MEM;&;Pt{HK-GMkR9SzHVRNtI6w1y@4 z!3dJ~dP^bpe($A^z%jSNA;D+VUH_-%vK7q1Lm2z=a0;xwzW(1?jfY3huL7>$zW`P& zg{goJyvjS>dB0!XXixu1r*>Vrc=PdHcQxO&KX*Oca(wmD>3u!(_6%IZWL~AI`5yu0 zckjhgs6fQ;J<$K7AHfM;2tov65P$R65fB33Ah14F`EGbwN%1Nmj~x!&m%gZgV#0(^ aDqnzT*kjMc%E+)Zrgt2d%jLLt@M8faxHWJ9 diff --git a/app/src/main/res/mipmap-mdpi/ic_person_shortcut.webp b/app/src/main/res/mipmap-mdpi/ic_person_shortcut.webp deleted file mode 100644 index 2e3e34dcc1ccbf675f582567ac2b230d544f5208..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1202 zcmV;j1Wo%=Nk&Gh1ONb6MM6+kP&iDU1ONapFTe{B*XJsdY*(3cQHFm56ax6q@tz$r z7FpgDR>4GCkk|f1z`2PoykU+lA=?b{jwk>P!_xo{om+Gf- zXBl>22-t&`86ur~(z(04C!gB3Z5Vh;S9}Hl$R7dqLGd~Fu?Z+(eDrDSK!b1ar}1V1 z-#~*8a1GAEo0bPfUF4oTC;<5a1OS>6Zo$hRW*K40O6|9Ag#H_ zxa?p8+-iIG|G!N$HMb_<4(f|NjjwG3QP9k!1g_ z-(R&|USBkQet-XJqK)Ug>(}qEWLvChv*0F6&-PlfQMzxaKwr$(CZQHip z2DLv9-gjn?{($F+=)VKEZ6nEEVcX87z4r~we^M3zEVl2zg8b;nh_VR{3Rhc(@roPPM#-Y47O$!`I6Ad?m95Uvw$|iT zw}FP7US-q=yAlr=6~d3tvO&8C`8o^CXul#@kJf>?Ssjpoxw zwxp{^(Mb~cD1dk_ks?&rAWd(Y{>~!lJ${BgG@}u$WP3xJ&6%Q)#ZurR&8Uf1%*u*1 zn}~$r}$X2q|P!j{(Op-_Hv3Fk(ze@S>6MrF=94B6JwvGXIeYRX9{mK^|NW zxRoLI%HE)10Bi@#J&uYa!fqnJ|G-~3A@}NQ&j5gap8Vr`QyeJ(9?P^6=NrYaE*)ed z4+tYN@LHzT(L?&(XPT8r$am5z{*gdP;#_M+QjO~%smbLhVxK-k#ODAnUIM%pdtGWZ zz>|{(jH{~f7AUSZ%K+AHPP}^J7dW!=0OvY6Q7t&dQ%e9q=QUB~4JY{;7;@2jYMdHy znxBcGRqwg5xpHukw~>ml(Piy$g{O}nw$4qj0051x|Kk2R^ij^hB>{FEqp*7Cz-8mx z#}oI*2}^@r3@ZLAu;}2karyMI{d%;+9{tA6Sh2~^$*A@Z3}>=;_X`XOg^(aW4+pcB QWh_vZ(;G}+)N>j|Qo1l*vj6}9 diff --git a/app/src/main/res/mipmap-xhdpi/ic_person_shortcut.webp b/app/src/main/res/mipmap-xhdpi/ic_person_shortcut.webp deleted file mode 100644 index f3767d04d44770e75ff81c3958a75935be364c35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2598 zcmV+>3fc8iNk&E<3IG6CMM6+kP&iBy3IG5vU%(d-^@f7BZ6t?3?E4QvL`;A(ZKR5d zrbJ72qA#qBGXxbX%c8_=nHZYHXuiC%q+JP=KeTW~I@EHM#~G*hf*|JJkvz0bPEG=Od>=`>Ok6R4E9(Ot$Acr$(KDNT6R}g)FXnoGQ-y zA6j*~C2=v%vEAFnDf8P8r{NjJ$llev-*6RhzJ0?$uhFVF$lJ(O!P8V`2&E~7Wn0fx zqv9GMX#}wz%6@>WNR@-DV92Ks33&Tut}6BmdlN~6SPW&q$W_L6X+8{D5Jr`~Ty-k# z1&SmHtHN@w0m>~SnanDZ@9pIpU}B*{AQT7vd9A0OYXW!u{W?ow6o-=BZ@5Nqyx5AQ z>;$jzO{r8BjxelRbl>5kpWvg z9Rfm0J`dLMoYd@vUtr6)o}=a?NIx70%gf;y2*W`b4#NqMp^!HAo9BN)Dx>}RYy>7R zv-o&Yt7qPkD(8czaNJ*B@{NaK82D0Z{+xP5sgwoA)sk&uo08q-ghr3w64@%=UFLfD zkPWSMnp8e?%n&hMC9Be9Co~FAB=mXm5zAKct}Em(!htD8tRBB6h@c-&mK(xWB07GN zxts@q+uZ#8L&@5Y!BWeI*uLeA6f3ZRC@_?hv9aG`hR%m!P`_p6Of&{W)OUsj&KR)v z*JK_)6dGxF89C4GWGMt{NTt$#Fe8ci*UR1{by#BlvVyX9 zq{>zcRN9hPLGl}H%}8S1jflrF@B0KsGM- zookfRpYsMwhn0BAHA>Ov(qU#|feT!te0(7jXo*_Bv6fTd>?gc^Rvj)*n#0F(>-$!! zSdHUYZ(~{eOR`AIRto>04;H4|#?>>g$X5&W;s!8*k{8(C@+p z$dOMhQ)ukyC0SzrhG7s`@gwje?59D%_q`ClpR3_iciBf)M*S|WEszgSRo3w_k#88s z06mrSeGg1t+jb1&Y#rB>ush_>8tHf4!hnaU)PE(uRxTTZ+{KbYX2lgnxqH?{74DM7 zP=IVnC4dI|`CSTZ{mav_zzX(k3fZe6J5PH*0ymq39m<_MX7jdNQj59Stg9&v51I7(n@2=8>THpqj%+n7K;#fqe&pDF5ut><-zZr#f(r z(BYv|P=gMXkd*)?zM$p(uUsRD`5oXVDS0@m_l01`v@*?H6O?Y*Aq!HFP5F{9GrH$q zG~W(f1EilZ7b-AfLWzPR)_BaF2c5uG#{qX7fgYSBr7IA6QWUyJuDF1!Otl9u!}OzX zMx|IF44>Bg)O|N_RcZ0$!)a^-vkakF!VLd7xBaO{s&@YM_@g=9p_U5v1r7tGf2OhA zdsfBC((k@7xjh70Ez*U7tTY&J+*`Sqt3;*V>-WPNN{kUNY#3FCw?Aoiv1YCcMVpSB z3p2zmYf)I3F~i_OvrYDEUsTv*wVIpf!jRUTLi7a-c(9?I!*lofvc0rp_MPWv_csGC zY=|HgtjI`6VA^Z&%b%(M&5{jX__*uf@sP*=q__IXYGvhho!oKeijV6ZK&v$L!@AQ~ zP40#+t>s{fOP{_el12_}zii~ft?!go22O$Ocgrr=wrDgXH{RD^h@lFr70%3^Ftz9C zc`tk@0fgT$Cv+Ng^n$5e|RF#B^-~^fX>xayDD(|^{@~VyV;DV*u zH_@z!=^LdE!m9NrXwiXVCcp-FC}G+;n{T@CXN*to_Z7T8s`Z0&$S>`i<)%dw!-Ij;z+WST zZq|x~TXxJGp7u?scW)?qhrape$0(SIRg+?-E`l0C=$26{lGHa`)knB*QY2=WIuk*S Iq1OLi03{6?6#xJL diff --git a/app/src/main/res/mipmap-xxhdpi/ic_person_shortcut.webp b/app/src/main/res/mipmap-xxhdpi/ic_person_shortcut.webp deleted file mode 100644 index 66189d8bf85d9781368826693798874410c994b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5130 zcmV+l6!q&;Nk&Ej6aWBMMM6+kP&iEW6951&kH8}kRfmGMZKRq%?Ct&o5D^oQ@3I67 z+NH=)i8|P=pG(731ep@~uH6U#mbr31Gcz+YGcz+YGcz+YGc&W_JH`h`kC~aowBqHR zk+i@5{q|oOq7Bu9*Gv_7=BR`X%+P@pl$Vq`l8l8r5F2*Cww=EMMol8IgnL_}d?gE1oh z3Q+SGb0V2Rcl+afT*Nq1pbrbfNy#QH zJ@teG)N2`%vpobiPOJlO7m;`pHT-=%;RrKnX-}m1z=#>Wk)m-?Or=rBJmCA+e@!u1o*oXxzCXlA1eI~*&X429tBj0!%IK`(&Dw*Yklf<*+ z)W}K3Nfccgc{%H}%o9$cg_X*_MyN@~SS>|IMpD6Pj%Gr%Fcn-pEHWbeM5PJPRB)Ye z7$pzJLkD`I(nM$}xbPLiVIHsK&ZHPaP8974iQnm96HfCLId^u5G}J`VnUPg+m~b9B zXHS6=%wXuGNGGvM%L3s%vnR9r^eBoHR>p#i1}!th1kf=TM+-nyf|T$E5gtPDOvEIZ zsW&leM+`wpRP2e)^2^m@&mJHp6#CWuVKriNw;55QW5%7{ftNNMAA4PWSHS|vj9Uy|( zO8QPT4Uo^Z8fP&t#dF?>B*j(mEv}WwZv9tc*|I5Q*)FhfesmSQgX;g|va9fGG#Vx8 z-kx|MlJdKvotyfT941PBUKlGcV!3qnr{M8W?JtCx_W-Zo6F(^u%mMn+zA`vWX6jEZ zKuVzOmU}~4O&3)6Q-3NsFtw(ABf88fwD*YYG-`S_feO0?@`g|c)%#+Vot!F#FXg#v zBuJJoM5&FGvVOr(UtYgWEqG9?_m<1$eAy*sH;M(RXp$Q2E z>yDf(Q;`pl7HB5*c#c7~ogAE?rHZ0}iutRqoGdY%wFEI^oj(j(N`64Lof;mC1nmkA zs8Hj9ljYufM-L#*SVi6m@KiAX+4k8?n}jB)KY+kR&GKp%3n%t5wY-p*m9 z0JRw}K;UxUfwTf-n0Ccf*eLR0tgDA?yL+$Nv0T*$b--r{6vw6?bY262OMMh4w}7e_ zG4<>Z%_y!wcFjkgT!`_2uk+_#@p=N8IG!B_W2O$|Jt_tXyoT-i=lNXo8$4Znapo)+ zJeNQwi61Azj;TYkof=COeXw0`G%unq!k>8g5+`(+ON`mlZjV(DixJ4E7&!-2Kd&b$ zzUTtD!M{s+80A>w%1?2Sx`hZz}{8NNJpSW>KxY%PEmW2SBro&nPKSq-2;- zWBAEmEYyEE3x3B^r#N!$0PQ6w*}KoFp=1c4#V8F6gc_d=LwBKN87XR%<2?&+*~6CU z%52_4_KLQz^NO`6S0}#oCr%9wOn^3nUR0!nNwNS`FqbF@Vm$%WQWz##04a z_It<%P@a-aBnzMg+Y9{y!*TP{MHgNx{QP5M~^Bq_&EeDlSh z>Op$w#uJ`BhTjK=(hxuyMS1^@F&W4$H#EN+(?4SD&35m#>}1bV^0HyNG6S$}P9Qb3 zOo_k@$4e(CD=xxsl5cwD@EO6~3Fq}5a42!?_W)7a9m*7VK3Tv#8*mLS%X6sR1ZawYR{+c;=OJJz%>%lIXv(h~9P@v9FA zyC~rqFv2L9Ix`uyOt(^T(6U1;W&DO)kQR$!VBzBoHfpFHC;xskr?5;%ni8*F5P(uFf4H)1_6X# zlzRyp4gI(L!dEA*$)L+ot4X9fomP-mYej?HL}&cPa6H_XVyUNq@x~>xIrau6fd#{S zKJX`YY)58@*X#E7DOOjI7$qyw$NYae5$2xp_E`nWAndgObUSj_FrTlxHDi=zg8eNa zIFs&hEIRWTU{Vy27$sN>&rO~Z!T^_U*;5+l%e^6!zPDtuITJ`#wYs|X3g=2xL7blo zfIef7*-XViasFwFru)G7>hJaRJG@mN z?!Z9<4h=(}^A;{>)tPU$uRn*R#a)h^} z?{$GMyqRy#BvKWVw$C6eafdRxFAvl6wmR4tAS^6it%_qI21$4`Y8FactQPC;wCA((+GR09T0Cf$9*20bl)F2BSA#>^QlzXz zMVkX)a1t`38FRBSJHtOS{rAW)7R_x!91OW*nK%_ic`WvnzNNL+ATk>Q=B-5l zqa%|P$^bDDLKrl%m*WTshJNvyiZ+0v z2Vi*_4#{AdKyY^=?6Einu$#Kb$|JL(VBtj#HS5D^0uCp_BAh1$b`vgc3Repw`t?W{3_i34tnm-uj_5Vt*9# zgp+(?0?ut3uk;*5)C@J*s_dm3!TqA_2!YHeoFhLJ@?z}WG@iqApyv$9;;SBWO6q$v zq<|zGLkZcBu~V@K;8Z+kgA;mAOQNlycIp*jdw9~P;#nLdr$V@8kga%qWC~Y?Q?{q% zMZ7VdeZ``yEVrg^>-b)r-61eJG%7y=_9Z#Ab%Mr}+N)la9?b|)fPmLuIVZq;WjLRX zMZFnbh9d>{GEYAn8&-uoz7XAecr%5bSDU7{hwFk?fJ;PN-vr>+~dC*sb>mQD;u z0;3eJ|Ex|-T!ejlA!%*U#$@N@S_0|AH~^N?LKe+g3a}Zy4!q96=2o;vvas;=q5cnc zUw`2!m~H7kC%e{-55N^*2QV-9l~`Q@XI|QZMX%G6J7;wrz+p@HpMph~;$(Zig}_b# z(5B}nf>1ae`FUy1oQh@JCKTX2Y*cxn!*Ao#i#F0Hd7V|co~efe?C-Ec!j4AiI9%z> z#9$B)AT;DJHw1KLW;|{lk1EeUyZK`#|B??v=zxyQYZGHt>YCz|R7|kc}kcRo_%NXmu^P-?1w-{%>kz z=Ye0bsS|tXq-yiADqm{%uEemq0Z++F!**Mv?OJd@K*^)6ZgmypdAM)j$6*Sd2mCjm z^9M!Ns`hbV1BF7i2Q>ZVSjfAHtPQbz;R`&e5k(DY2Q3ijx0o= zJP`?&01Z$4h=4%QM4ccIC{Ivn=72PR)WkS-UR{#n_xrk-`iH%Yyowe9uu!^`(O#OV zAX)^XNdP3}Jx!4afNBx|36%Eu_yhq|6NIG&0opr~%3#>GZ5Ubqf1Sn|c0oi;0KIZo zMf4!07D`K;m$r910oa1Cjdx zy{OD+r?RS>Dyb9C&Xpz}rX6Af8?m;@7&&SLh=9q2q-Bsu88_-n)wyx;bwykVi z);iDk{*Fcb#L$2jKovyvq2(~h2rZJ-a?RY`;W>+TZQH7?sE>VdcmI325CyRkfd9F> zJCxU5!9bBDCp4^MSY0j$UtoLtKSPqNZ@Jo7+qP}|0lVi4x3=wbwYF{Bw(T8z+Fi}5 zsxCc~5q&x{A~LVP@#_dm+qNB!rmLztm2^j~B#oqPn`5kO`v-XGS$a3Kvu*P;+UD1` z5u@H05+q4ZqfN|c7K95S7S8-Z=s(lYMOOe)(IujmnvdIp*Ycji1S4wbMfh>%P9^Q7 z>HJI@oGE9@k#@i#Z~@?x^E2T506!WBwdLx}lGzh?Aw8%zaRl><7jCTUuF8~ViZdnY zqVOw+!^WlNrN->vdH)BVUc*a}<~(V#pr|_8P}O&3?uu-enYDC2AMxaGJpL^Y@8jh+ zNb@F50zrn{P`$Y>+i7%NOBMuV{5wkdws6#g-;&3_mckb?d?90K1C}ASbH%S??TfDp5J%ZwUqRt(7- z0|2yiMWO!iKz-tE0pdoz_d6+jj0I;EI2bq||H$F{IQ9a+L7b@QmGqn0a3*z7aK8S9 zqm#$(jDXk(`tvM5e*%x|;E-$FK9nDL)riMg912v*_-(D{=^~i3g$J%&Fb(MZSuj;= zYqxuYu1cllJ>MU`a$8-tIV{<`?!#U|J#bjs+hIPn7b+Boldb;OMes1)1|?g3?8E=I zKyfw+GR@D^cFbwH5BB!k&vrYS6rmrx0ndY2NEPnh3`N{5KQ&$aIy{VtRBF#P-_xNu zmk`Pqh0XUEBiXiJ`P_@7bPt|ntYk}e?KrfJ6zbsuF$3GVbRNQ zp0+WTjEZL{JeXy-q_mqc)mKuWg8-BrZLosaN~QFgfD5+L(`k$`Bp+yVAhkA(C}R!E z@(8f)lVCHI%xG7;1^Jn(i# z-Zu}K5Ncc2UW{CXU_y|AQ5yw>_a98Pc0poj?!7(fji*4g|MgCNh6$oJ{g)ln4=K7e zB&&TOQOuqnmxjX@$QwTgk_E*2(_(nsAEKjm1QJGb@6AbrgIpgV|Ckd@9JT3xY(p5U z%)9J&u%iSr`M<$wphCGjw{;hAK@VMYnSu2gJy(L#RmJPd*H`(5+N~^2?sMSz#CRlTKtU(E+BJ=DI34G3gU`OFVj&7@TM@_MMW zE&0EH-gNh+c90+;L~;itSBNQzaEe#!Zv9S!7Ra1s??Z?fD8cQ?GxWxbz_RYI-FwR~ zueAB4!9M_bLmcsSYQx$dzqS5RyFkX&F8%ZbjLju-Lr_F`-?Ox=`i zsE4d=`F_y~Jn|(Bh^PZKKIb`Fb?o5PhuHCu$3zg43V3*5&|n%F5e7hGfGO%}Pyu&wE@C0Tp0w?l;3|V*!&G0%p!SH9ba-+{I=$h3DuSmEkT5FV zA;M*d?5PV90ed>_R}BM(ORE0*JeyBu&%EUJ?<*~Y0g>^>kbZcCabTzs28aPLK+M3z zWwH(EkW2-jxZBUXw&)LFPcC<>p0Hyz_1U-4qDvl+u79}@iWU|GMaxhafEj#2mSM$l zfFOVkL2^uyg+bu7FRyza*aKzj-DeL%cB*E(n`zNapVuyXItmUTY%oU@4r2h=VoB}; z@XCwM?IN%@!@h%(!Fqe`qEDlN*o z_8Wlo;XvW?oOH@gdL>Tq3pD#U<}zORN>-SBZq2t!r)0DOZ1 zl!!x$B?y`<)AkWEkM?3uXj3M2_nuHMf^u*-uWk8Oo$e&qg6SI{bjlT?3`Crv39rNYq&iufKtYvu`UNvO01R_)vcjSK%+ zNvwzIXarV?5u^qTbOHlk$N(9-X2?0f6ilIzjP>~gSk>Lyu0i#{20+O3e{Hm@FcVWH z;6kUN`Xw8N=3DGdz{ayUKWSAu_0rl<1E~9T(5|MXwE-{_Ef^9!&sYr#Jxz$q*>=zu zuf7Ajj=v_vpoQCZ(5@C+cUKt?7mO*X#G5kPotnUG2?j74f;r|pVArl!LR;`>3u8S* zZ&lH*B_KBwZHcZIsfI-tN+22~xffuNeCl`s>}qc~I2qc89~pK2+e*voha~{h)hl3E%KVR(5ChqQUBHA|m-{&va|4W=##7YVj02>q_VMh7n$q?&GMf}_lU#$*+ZCeyWokQBW*I7jC z{(rCgA5d}_fRWq)l>2N%m-|2Rhinc5p07W4DY1rXrL^lLVTXHGV&R|DC`zWO_bbik`md-@@w1}NTSGF>Rm6ikgbSZGXN zn;tCB9%z3k0kO4cHy>T_@4Mv49Sh&-o$7oG$Z=3`4+M+>2bF+qxM`4D+Z59UyFc6h zK3y&Y*D!+eX}*P+00Jlm0+iZVD<228E6$wJpSqYyC+z-g^)t{`yun5Y1H~JRrA&bU zzHu6Zhmy`+Bk&B^-u>*HB>@W%pAl8GZ zz#ID;r9(7dK0aj3BLYv!J|1GfnF)zxS3fAZ3e51zYy z`I$!t9{t$5`&*~rQNQ{3%H6N09(i^9sXL!Mef`#xcMhf)FkWQrn>lI#5|-Lc8-b^O z%!F0*_hv>T#)Q?30^0hkMVYYXV%o&qF-TZdzc#)Do~j))VJ&c&vj}T3kgzI#khcCc z!mLM`utI#y%EwGtmDu>zPkJ!90}|Hc&fIWgYH*GTYu&syHX!DbIVP+XYg=D%PCdOe zX8>m;*4}n!I;%t7+VXVgJl^4Ok3+j1SC*1MAyO5c@~wYsH~%SL|F?PT&$?=;OpS9} z9Ssx-j06O645{^feI9M zTXt2L3RP^e?Xvbxd(XyW<~p_gS!n$3KOKOWTBB{$PzgQFf6RYu+bxxlPu%`tCkQr} ziSbiOjD=t-tmAZI9HvqgSVF*_F}?r+(w1=gu?5<-!~U0fwLP2d^VJ@}3Fg5+Z3$8d zOag`&XmEwZ1Rk$fXfN%<^7MPx_WS%JC>zNj)DR&*0W5}Itp>D2?w~9fz$IMLNzfRV z?bM~b0+0xkpi(?rZ0s%48}}6 zHtth(inTC4-GH59CU)x>3INDJ0@=pQ1p^8*k5;vBF;Y#2i+Ox)lgbr=|{dudJ~&r333BS3Cb z2+agUjg!AvR&##w3y`u?LA0ELCO$#Fm|&R@12E{PT7U}I6;Od*uB5=|Slx@Vg>wQ4 z0)~8cp$<)<)-e!f*HZTmfFd5XsV#JW9B8=(EBS1 zrajdXCU3PWU_#1Mf*7ez1=MYhd^CLZ2P&a0_^m0B;zWy!Z~Qt3jW{tSi^xVh_e`2CCo(H$SBTtSC4f>JhMpf6zu=j89N%Pd!- zo`nV=AZlfBhKiQj!g?rhbn>aIfkV?pfaqrA(?6mNkWip91d-1I`&Z=^Mz+JD*PJ4u zw#1SsDkYB+X?!ukuu;A(VvCXqG_H|CCOtK`;!VaUUko`jh8Rfh0^sZCYzjn{R}QTF zA_z6qSd@T2A*C;ek@ecU-9bnVB9Iy&sz6(~zhykJ$hGvhRj#R27*YXbywQXJ1?dr` zFT?8A0wf%L$94lE>(4%1gX(>#B0};0)M*?FVpD38Em*x=Np zQ6MhlRVsX8KC8k}BCaoS1jLMZB=m%Kh>>kw^XXF9F}2ZzJkS*V`BkzTV&~L=4QU){ z`0j3TW2JNEtTz=1QY0TMs67|}8P+0igN}5KQ8m~vX-cU56E4uY4Rb@sAS$)Eq7hE{ zJKl1Kktq7XJqGb6Mfy<`gLsqv@|X`XM01|Nk`SXB@~@g#wP6WG*2Q1_yagi?1_lE0 zK|m$W&}o!KGKe*q9`#yc3JTzc;!SG+ixvteV?zopjfxf@em@Wo9Vp3HcMS*Efi-8U&IX^Lre20F*Dv2uLk!Ysfb^ZicAMa#ZdIYZ=iq(k?Q3KZ@lv( zBZ>p4Xt}>tILi4{(lZW`g8&T2n=z;R5Bka<8%MLhyIVf|p;V{#PBccGdxTRPiRMq(QWJx7HBYIedJP0u#~O5VdkU_NdS znanpvXvmD%W<76JBXnYL7Z27brbjAP;yucOGY;029U$YPOfgw7)uJBn3hO+3(1Gj`RJ#3?Ny2pWg!) zt3sU-jHGj;{s`ZWuIjZjQT!YqXZKsb$v@nd1Z2?mYVHIih(F^?T=_6{kRHNlAVJ$g z-=?+*NDN2#I6A5FQ?Z&i>GqYQi2LJjtT*P5#awO6t!c|ZclkhiI0C|=C2Y)gEw zx;eGOlK^3koK4g*6fs;R5%D5h>DlDie|@IuOwVdiwLM_I6RN%KyG_}Yn1?=_ytA2V z^Myjwg!;bj)N|%ohiNjF4wKq=8EfB+Sj!LL3 zsDVQ32}osTzanFnY*3by8`@=}8@v{*o1gYq0Wnf$Hn3_*ZL33p^3MG9+7yh9Stb_W zUznG1qj(*}hkFA9GcqPqHJFlvV{h(ik@s|l>cx-5mJG&Xs$jA&`YQ>DU@JvMu8h(` zMG`d6qH%O2F0ys-7&k0a}&GyzU( zGRWZi$8S7pMLS#&Kx^|jR+Nht2of-OP0x~F$0E}J2bI_m8Tj<-ljuaf+FM#XiLMoi z-V*eidoB)!@A_k4aF7zfF(ssQ;*obpy3q;~2;M`q4WxsFB9x#f`QpaYAFVjKK@8*2 z+cX(vSWKUO`;%9)(2k7Y!=`6MfU87;pH4#Dd-C#;tKa_S+x5YX%mJL>hZzY?{r1#% zUlpMP#gHlsl>!ZTx~f}hhD4SHKcCnwRLE=E@_1m|EJKvGhQ7P=-}+_ffIE%{a`i%? z(>nLcZySrhFum(;hr8^mlEr3XnsG{0Cs%)c-6Xov4hslQOfyG|DW0xtCTc^;x_oKr ztrOdCW^6TgUCBXULz!{LM0sfAKX;ud`Ot+n)ih%qt8z}))gPumLh`;8duC>Ep#K2r zm9#Qlh}o(d(=0BQ7smg2?5|~BbfW_nNbLYfxte05)n)0tCJ9#r9~&F(!TcT#TQ+vP zx)8}?WR>d#byGW|LnA})4!mPVH#(3u@7qz!XzH{By#r?kImb|yQL@V$XF$96bW0#u#W_K-(21!)Dpb|8KR?rTr;`8pDk(W}+Jnp^m zRyHk(g2xrlsM0Dy8vivR!s diff --git a/app/src/main/res/raw-night/lottie_kbs_fail.json b/app/src/main/res/raw-night/lottie_kbs_fail.json deleted file mode 100644 index 09200340ed..0000000000 --- a/app/src/main/res/raw-night/lottie_kbs_fail.json +++ /dev/null @@ -1 +0,0 @@ -{"v":"5.5.2","fr":60,"ip":0,"op":190,"w":100,"h":100,"nm":"Progress indicator - Indeterminate - End Fail","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"check2 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":114,"s":[0]},{"t":117,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,51,0],"ix":2},"a":{"a":0,"k":[50,50,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[4.019,-19.126],[3.135,7.112],[-3.163,7.112],[-3.991,-19.126]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-2.293,0],[0,-2.293],[2.32,0],[0,2.292]],"o":[[2.32,0],[0,2.292],[-2.293,0],[0,-2.293]],"v":[[-0.014,11.339],[4.184,15.232],[-0.014,19.126],[-4.185,15.232]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.380392163992,0.568627476692,0.952941179276,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":[50.047,48.874],"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":"Group 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":190,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"1","parent":3,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":184,"s":[100]},{"t":189,"s":[0]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-26]},{"t":81,"s":[0]}],"ix":10},"p":{"a":0,"k":[0,0,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":[70,70],"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":[0.380392163992,0.568627476692,0.952941179276,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"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":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":96,"s":[0]},{"t":107,"s":[0]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":0,"s":[5.5]},{"t":96,"s":[100]}],"ix":2},"o":{"a":0,"k":1,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":190,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":3,"nm":"Rotator","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":323,"s":[1444]}],"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":0,"op":190,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/app/src/main/res/raw-night/lottie_kbs_loading.json b/app/src/main/res/raw-night/lottie_kbs_loading.json deleted file mode 100644 index 49f6c87180..0000000000 --- a/app/src/main/res/raw-night/lottie_kbs_loading.json +++ /dev/null @@ -1 +0,0 @@ -{"v":"5.5.2","fr":60,"ip":1,"op":324,"w":100,"h":100,"nm":"Progress indicator - Indeterminate - Circular","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"4","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":243,"s":[787.1]},{"t":323,"s":[804.2]}],"ix":10},"p":{"a":0,"k":[0,0,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":[70,70],"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":[0.380392163992,0.568627476692,0.952941179276,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"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":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":283,"s":[0]},{"t":323,"s":[69.5]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":243,"s":[5.5]},{"t":283,"s":[75]}],"ix":2},"o":{"a":0,"k":1,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":243,"op":324,"st":243,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"3","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":162,"s":[519]},{"t":242,"s":[536]}],"ix":10},"p":{"a":0,"k":[0,0,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":[70,70],"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":[0.380392163992,0.568627476692,0.952941179276,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"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":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":202,"s":[0]},{"t":242,"s":[69.5]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":162,"s":[5.5]},{"t":202,"s":[75]}],"ix":2},"o":{"a":0,"k":1,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":162,"op":243,"st":162,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"2","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":81,"s":[249]},{"t":162,"s":[268]}],"ix":10},"p":{"a":0,"k":[0,0,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":[70,70],"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":[0.380392163992,0.568627476692,0.952941179276,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"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":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":121,"s":[0]},{"t":161,"s":[69.5]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":81,"s":[5.5]},{"t":121,"s":[75]}],"ix":2},"o":{"a":0,"k":1,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":81,"op":162,"st":81,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"1","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-26]},{"t":81,"s":[0]}],"ix":10},"p":{"a":0,"k":[0,0,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":[70,70],"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":[0.380392163992,0.568627476692,0.952941179276,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"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":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":40,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":80,"s":[69]},{"t":81,"s":[69]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":0,"s":[5.5]},{"t":40,"s":[75]}],"ix":2},"o":{"a":0,"k":1,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":81,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Rotator","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":323,"s":[1444]}],"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[],"ip":0,"op":324,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/app/src/main/res/raw-night/lottie_kbs_success.json b/app/src/main/res/raw-night/lottie_kbs_success.json deleted file mode 100644 index 4c32e40c57..0000000000 --- a/app/src/main/res/raw-night/lottie_kbs_success.json +++ /dev/null @@ -1 +0,0 @@ -{"v":"5.5.2","fr":60,"ip":0,"op":189,"w":100,"h":100,"nm":"Progress indicator - Indeterminate - End success","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"check Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":107,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":109,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":183,"s":[100]},{"t":188,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50.5,51,0],"ix":2},"a":{"a":0,"k":[50,50,0],"ix":1},"s":{"a":0,"k":[81,81,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-19.278,2.378],[-7.103,14.354],[19.278,-14.354]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.380392163992,0.568627476692,0.952941179276,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.5,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[49.136,49.354],"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":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":116,"s":[0]},{"t":122,"s":[100]}],"ix":1},"e":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":189,"st":-1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"1","parent":3,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":183,"s":[100]},{"t":188,"s":[0]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1,"s":[-26]},{"t":80,"s":[0]}],"ix":10},"p":{"a":0,"k":[0,0,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":[70,70],"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":[0.380392163992,0.568627476692,0.952941179276,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"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":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":95,"s":[0]},{"t":106,"s":[0]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":-1,"s":[5.5]},{"t":95,"s":[100]}],"ix":2},"o":{"a":0,"k":1,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":189,"st":-1,"bm":0},{"ddd":0,"ind":3,"ty":3,"nm":"Rotator","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1,"s":[0]},{"t":322,"s":[1444]}],"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":0,"op":189,"st":-1,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/app/src/main/res/raw/lottie_15s_play_pause.json b/app/src/main/res/raw/lottie_15s_play_pause.json deleted file mode 100644 index b34b334670..0000000000 --- a/app/src/main/res/raw/lottie_15s_play_pause.json +++ /dev/null @@ -1 +0,0 @@ -{"v":"4.8.0","meta":{"g":"LottieFiles AE 3.0.2","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":50,"w":704,"h":704,"nm":"Pause","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Play","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"t":10,"s":[0]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":10,"s":[90]}],"ix":10},"p":{"a":0,"k":[352,352,0],"ix":2},"a":{"a":0,"k":[264,264,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"t":10,"s":[50,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-2.051,-2.95],[0,-3.593],[2.051,-2.95],[3.368,-1.25],[0,0],[0,18.15],[0,0],[-15.752,-9.108]],"o":[[3.368,1.25],[2.051,2.95],[0,3.593],[-2.051,2.95],[0,0],[-15.708,9.108],[0,0],[0,-18.15],[0,0]],"v":[[188.962,-16.544],[197.287,-10.093],[200.438,-0.044],[197.287,10.005],[188.962,16.456],[-171.838,225.456],[-200.438,209],[-200.438,-209],[-171.838,-225.456]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,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":[288.438,263.999],"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":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1800,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Pause","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":10,"s":[100]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[-90]},{"t":10,"s":[0]}],"ix":10},"p":{"a":0,"k":[352,352,0],"ix":2},"a":{"a":0,"k":[264,264,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[50,50,100]},{"t":10,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-6.075,0],[0,0],[0,-6.075],[0,0],[6.075,0],[0,0],[0,6.075],[0,0]],"o":[[0,0],[6.075,0],[0,0],[0,6.075],[0,0],[-6.075,0],[0,0],[0,-6.075]],"v":[[-55,-220],[55,-220],[66,-209],[66,209],[55,220],[-55,220],[-66,209],[-66,-209]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,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":[374,264],"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":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-6.075,0],[0,0],[0,-6.075],[0,0],[6.075,0],[0,0],[0,6.075],[0,0]],"o":[[0,0],[6.075,0],[0,0],[0,6.075],[0,0],[-6.075,0],[0,0],[0,-6.075]],"v":[[-55,-220],[55,-220],[66,-209],[66,209],[55,220],[-55,220],[-66,209],[-66,-209]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,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":[154,264],"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":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1800,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/app/src/main/res/raw/lottie_insights_100.json b/app/src/main/res/raw/lottie_insights_100.json deleted file mode 100644 index 495035cb42..0000000000 --- a/app/src/main/res/raw/lottie_insights_100.json +++ /dev/null @@ -1 +0,0 @@ -{"v":"4.12.0","fr":29.9700012207031,"ip":0,"op":59.0000024031193,"w":800,"h":800,"nm":"confettis2","ddd":0,"assets":[{"id":"comp_1","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"p20","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":4,"s":[100],"e":[0]},{"t":43.0000017514259}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":4,"s":[400,400,0],"e":[71,152,0],"to":[1.83333337306976,-220.66667175293,0],"ti":[85.1666641235352,-23.3333339691162,0]},{"t":43.0000017514259}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.901960790157,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":4.00000016292334,"op":364.000014826024,"st":4.00000016292334,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"p19","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":3,"s":[100],"e":[0]},{"t":42.0000017106951}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":3,"s":[400,400,0],"e":[579,746,0],"to":[101.833335876465,91.3333358764648,0],"ti":[27.1666660308838,-153.33332824707,0]},{"t":42.0000017106951}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":3.00000012219251,"op":363.000014785293,"st":3.00000012219251,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"p18","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":2,"s":[100],"e":[0]},{"t":41.0000016699642}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":2,"s":[400,400,0],"e":[503,238,0],"to":[-84.1666641235352,-74.6666641235352,0],"ti":[-88.8333358764648,-45.3333320617676,0]},{"t":41.0000016699642}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.074509806931,0.737254917622,0.172549024224,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":2.00000008146167,"op":362.000014744562,"st":2.00000008146167,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"p17","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":1,"s":[100],"e":[0]},{"t":40.0000016292334}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":1,"s":[400,400,0],"e":[91,556,0],"to":[-82.1666641235352,-112.666664123535,0],"ti":[73.1666641235352,-199.33332824707,0]},{"t":40.0000016292334}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":1.00000004073083,"op":361.000014703831,"st":1.00000004073083,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"p16","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":0,"s":[100],"e":[0]},{"t":39.0000015885026}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":0,"s":[400,400,0],"e":[511,308,0],"to":[77.8333358764648,91.3333358764648,0],"ti":[51.1666679382324,60.6666679382324,0]},{"t":39.0000015885026}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.270588248968,0.529411792755,0.952941179276,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360.000014663101,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"p15","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":1,"s":[100],"e":[0]},{"t":40.0000016292334}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":1,"s":[400,400,0],"e":[155,280,0],"to":[-30.1666660308838,-122.666664123535,0],"ti":[95.1666641235352,-53.3333320617676,0]},{"t":40.0000016292334}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.901960790157,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":1.00000004073083,"op":361.000014703831,"st":1.00000004073083,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"p14","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":2,"s":[100],"e":[0]},{"t":41.0000016699642}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":2,"s":[400,400,0],"e":[681,388.872,0],"to":[143.83332824707,49.3333320617676,0],"ti":[-58.8333320617676,48.6666679382324,0]},{"t":41.0000016699642}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":2.00000008146167,"op":362.000014744562,"st":2.00000008146167,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"p13","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":3,"s":[100],"e":[0]},{"t":42.0000017106951}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":3,"s":[400,400,0],"e":[257,284,0],"to":[-24.1666660308838,-72.6666641235352,0],"ti":[75.1666641235352,-5.33333349227905,0]},{"t":42.0000017106951}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.074509806931,0.737254917622,0.172549024224,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":3.00000012219251,"op":363.000014785293,"st":3.00000012219251,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"p12","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":4,"s":[100],"e":[0]},{"t":43.0000017514259}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":4,"s":[400,400,0],"e":[301,474,0],"to":[-14.1666669845581,31.3333339691162,0],"ti":[65.1666641235352,-13.3333330154419,0]},{"t":43.0000017514259}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":4.00000016292334,"op":364.000014826024,"st":4.00000016292334,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"p11","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":0,"s":[100],"e":[0]},{"t":39.0000015885026}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":0,"s":[400,400,0],"e":[499,570,0],"to":[-8.16666698455811,63.3333320617676,0],"ti":[-62.8333320617676,-29.3333339691162,0]},{"t":39.0000015885026}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.270588248968,0.529411792755,0.952941179276,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360.000014663101,"st":0,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"p10","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":1,"s":[100],"e":[0]},{"t":40.0000016292334}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":1,"s":[400,400,0],"e":[557,68,0],"to":[81.8333358764648,-104.666664123535,0],"ti":[-58.8333320617676,104.666664123535,0]},{"t":40.0000016292334}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.901960790157,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":1.00000004073083,"op":361.000014703831,"st":1.00000004073083,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"p9","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":2,"s":[100],"e":[0]},{"t":41.0000016699642}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":2,"s":[400,400,0],"e":[715,138,0],"to":[151.83332824707,-46.6666679382324,0],"ti":[-26.8333339691162,72.6666641235352,0]},{"t":41.0000016699642}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":2.00000008146167,"op":362.000014744562,"st":2.00000008146167,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":"p8","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":3,"s":[100],"e":[0]},{"t":42.0000017106951}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":3,"s":[400,400,0],"e":[679,664,0],"to":[107.833335876465,89.3333358764648,0],"ti":[-92.8333358764648,-103.333335876465,0]},{"t":42.0000017106951}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.074509806931,0.737254917622,0.172549024224,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":3.00000012219251,"op":363.000014785293,"st":3.00000012219251,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":"p7","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":4,"s":[100],"e":[0]},{"t":43.0000017514259}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":4,"s":[400,400,0],"e":[97,686,0],"to":[-36.1666679382324,53.3333320617676,0],"ti":[75.1666641235352,-39.3333320617676,0]},{"t":43.0000017514259}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":4.00000016292334,"op":364.000014826024,"st":4.00000016292334,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":"p6","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":5,"s":[100],"e":[0]},{"t":44.0000017921567}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":5,"s":[400,400,0],"e":[65,340,0],"to":[-148.16667175293,-132.66667175293,0],"ti":[61.1666679382324,-65.3333358764648,0]},{"t":44.0000017921567}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.270588248968,0.529411792755,0.952941179276,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":5.00000020365417,"op":365.000014866755,"st":5.00000020365417,"bm":0},{"ddd":0,"ind":16,"ty":4,"nm":"p5","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":6,"s":[100],"e":[0]},{"t":45.0000018328876}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.004,"y":0.691},"o":{"x":0.014,"y":0},"n":"0p004_0p691_0p014_0","t":6,"s":[400,400,0],"e":[400,23.613,0],"to":[-55.3803939819336,-168.204071044922,0],"ti":[27.0301876068115,124.269813537598,0]},{"t":45.0000018328876}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.901960790157,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":6.00000024438501,"op":366.000014907486,"st":6.00000024438501,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"p4","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":7,"s":[100],"e":[0]},{"t":46.0000018736184}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":7,"s":[400,400,0],"e":[303,660,0],"to":[109.833335876465,69.3333358764648,0],"ti":[97.1666641235352,0.66666668653488,0]},{"t":46.0000018736184}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":7.00000028511585,"op":367.000014948216,"st":7.00000028511585,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":"p3","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":8,"s":[100],"e":[0]},{"t":47.0000019143492}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":8,"s":[400,400,0],"e":[663,498,0],"to":[41.8333320617676,109.333335876465,0],"ti":[-71.8333358764648,39.6666679382324,0]},{"t":47.0000019143492}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.076272718608,0.735462605953,0.171031266451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":8.00000032584668,"op":368.000014988947,"st":8.00000032584668,"bm":0},{"ddd":0,"ind":19,"ty":4,"nm":"p2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":9,"s":[100],"e":[0]},{"t":48.0000019550801}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":9,"s":[400,400,0],"e":[187,88,0],"to":[-0.16666667163372,-158.66667175293,0],"ti":[89.1666641235352,6.66666650772095,0]},{"t":48.0000019550801}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.271778345108,0.528400123119,0.952267169952,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":9.00000036657752,"op":369.000015029678,"st":9.00000036657752,"bm":0},{"ddd":0,"ind":20,"ty":4,"nm":"p1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.01],"y":[0]},"n":["1_1_0p01_0"],"t":0,"s":[100],"e":[0]},{"t":39.0000015885026}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.01,"y":0},"n":"0_1_0p01_0","t":0,"s":[400,400,0],"e":[621,234,0],"to":[-0.16666667163372,-158.66667175293,0],"ti":[-92.8333358764648,-103.333335876465,0]},{"t":39.0000015885026}],"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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.855,0],[0,-7.855],[-7.855,0],[0,7.855]],"o":[[-7.855,0],[0,7.855],[7.855,0],[0,-7.855]],"v":[[0,-14.223],[-14.223,0],[0,14.223],[14.223,0]],"c":true},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.903676450253,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fond 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[80,80],"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":"Transformer "}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360.000014663101,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"confettis1","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":42,"ix":10},"p":{"a":0,"k":[396,400,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[91.5,91.5,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":9.00000036657752,"op":369.000015029678,"st":9.00000036657752,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"confettis1","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":267,"ix":10},"p":{"a":0,"k":[416,420,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[64.5,64.5,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":7.00000028511585,"op":367.000014948216,"st":7.00000028511585,"bm":0},{"ddd":0,"ind":3,"ty":0,"nm":"confettis1","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":358,"ix":10},"p":{"a":0,"k":[436,400,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[64.5,64.5,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":5.00000020365417,"op":365.000014866755,"st":5.00000020365417,"bm":0},{"ddd":0,"ind":4,"ty":0,"nm":"confettis1","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":177,"ix":10},"p":{"a":0,"k":[416,380,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[64.5,64.5,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":3.00000012219251,"op":363.000014785293,"st":3.00000012219251,"bm":0},{"ddd":0,"ind":5,"ty":0,"nm":"confettis1","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":132,"ix":10},"p":{"a":0,"k":[416,400,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[91.5,91.5,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":1.00000004073083,"op":361.000014703831,"st":1.00000004073083,"bm":0},{"ddd":0,"ind":6,"ty":0,"nm":"confettis1","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-90,"ix":10},"p":{"a":0,"k":[396,400,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[91.5,91.5,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":8.00000032584668,"op":368.000014988947,"st":8.00000032584668,"bm":0},{"ddd":0,"ind":7,"ty":0,"nm":"confettis1","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":135,"ix":10},"p":{"a":0,"k":[416,420,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[64.5,64.5,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":6.00000024438501,"op":366.000014907486,"st":6.00000024438501,"bm":0},{"ddd":0,"ind":8,"ty":0,"nm":"confettis1","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":226,"ix":10},"p":{"a":0,"k":[436,400,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[64.5,64.5,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":4.00000016292334,"op":364.000014826024,"st":4.00000016292334,"bm":0},{"ddd":0,"ind":9,"ty":0,"nm":"confettis1","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":45,"ix":10},"p":{"a":0,"k":[416,380,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[64.5,64.5,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":2.00000008146167,"op":362.000014744562,"st":2.00000008146167,"bm":0},{"ddd":0,"ind":10,"ty":0,"nm":"confettis1","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[416,400,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[91.5,91.5,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":0,"op":360.000014663101,"st":0,"bm":0}]} \ No newline at end of file diff --git a/app/src/main/res/raw/lottie_kbs_fail.json b/app/src/main/res/raw/lottie_kbs_fail.json deleted file mode 100644 index 6a112c2e1b..0000000000 --- a/app/src/main/res/raw/lottie_kbs_fail.json +++ /dev/null @@ -1 +0,0 @@ -{"v":"5.5.2","fr":60,"ip":0,"op":190,"w":100,"h":100,"nm":"Progress indicator - Indeterminate - End Fail","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"check2 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":114,"s":[0]},{"t":117,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,51,0],"ix":2},"a":{"a":0,"k":[50,50,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[4.019,-19.126],[3.135,7.112],[-3.163,7.112],[-3.991,-19.126]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-2.293,0],[0,-2.293],[2.32,0],[0,2.292]],"o":[[2.32,0],[0,2.292],[-2.293,0],[0,-2.293]],"v":[[-0.014,11.339],[4.184,15.232],[-0.014,19.126],[-4.185,15.232]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.172549024224,0.419607847929,0.929411768913,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":[50.047,48.874],"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":"Group 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":190,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"1","parent":3,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":184,"s":[100]},{"t":189,"s":[0]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-26]},{"t":81,"s":[0]}],"ix":10},"p":{"a":0,"k":[0,0,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":[70,70],"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":[0.172549024224,0.419607847929,0.929411768913,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"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":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":96,"s":[0]},{"t":107,"s":[0]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":0,"s":[5.5]},{"t":96,"s":[100]}],"ix":2},"o":{"a":0,"k":1,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":190,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":3,"nm":"Rotator","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":323,"s":[1444]}],"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":0,"op":190,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/app/src/main/res/raw/lottie_kbs_loading.json b/app/src/main/res/raw/lottie_kbs_loading.json deleted file mode 100644 index 5ed8cc6b84..0000000000 --- a/app/src/main/res/raw/lottie_kbs_loading.json +++ /dev/null @@ -1 +0,0 @@ -{"v":"5.5.2","fr":60,"ip":1,"op":324,"w":100,"h":100,"nm":"Progress indicator - Indeterminate - Circular","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"4","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":243,"s":[787.1]},{"t":323,"s":[804.2]}],"ix":10},"p":{"a":0,"k":[0,0,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":[70,70],"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":[0.172549024224,0.419607847929,0.929411768913,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"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":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":283,"s":[0]},{"t":323,"s":[69.5]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":243,"s":[5.5]},{"t":283,"s":[75]}],"ix":2},"o":{"a":0,"k":1,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":243,"op":324,"st":243,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"3","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":162,"s":[519]},{"t":242,"s":[536]}],"ix":10},"p":{"a":0,"k":[0,0,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":[70,70],"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":[0.172549024224,0.419607847929,0.929411768913,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"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":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":202,"s":[0]},{"t":242,"s":[69.5]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":162,"s":[5.5]},{"t":202,"s":[75]}],"ix":2},"o":{"a":0,"k":1,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":162,"op":243,"st":162,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"2","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":81,"s":[249]},{"t":162,"s":[268]}],"ix":10},"p":{"a":0,"k":[0,0,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":[70,70],"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":[0.172549024224,0.419607847929,0.929411768913,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"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":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":121,"s":[0]},{"t":161,"s":[69.5]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":81,"s":[5.5]},{"t":121,"s":[75]}],"ix":2},"o":{"a":0,"k":1,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":81,"op":162,"st":81,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"1","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-26]},{"t":81,"s":[0]}],"ix":10},"p":{"a":0,"k":[0,0,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":[70,70],"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":[0.172549024224,0.419607847929,0.929411768913,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"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":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":40,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":80,"s":[69]},{"t":81,"s":[69]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":0,"s":[5.5]},{"t":40,"s":[75]}],"ix":2},"o":{"a":0,"k":1,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":81,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Rotator","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":323,"s":[1444]}],"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[],"ip":0,"op":324,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/app/src/main/res/raw/lottie_kbs_success.json b/app/src/main/res/raw/lottie_kbs_success.json deleted file mode 100644 index 10cecb2e74..0000000000 --- a/app/src/main/res/raw/lottie_kbs_success.json +++ /dev/null @@ -1 +0,0 @@ -{"v":"5.5.2","fr":60,"ip":0,"op":189,"w":100,"h":100,"nm":"Progress indicator - Indeterminate - End success","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"check Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":107,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":109,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":183,"s":[100]},{"t":188,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50.5,51,0],"ix":2},"a":{"a":0,"k":[50,50,0],"ix":1},"s":{"a":0,"k":[81,81,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-19.278,2.378],[-7.103,14.354],[19.278,-14.354]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.172549024224,0.419607847929,0.929411768913,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.5,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[49.136,49.354],"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":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":116,"s":[0]},{"t":122,"s":[100]}],"ix":1},"e":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":189,"st":-1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"1","parent":3,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":183,"s":[100]},{"t":188,"s":[0]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1,"s":[-26]},{"t":80,"s":[0]}],"ix":10},"p":{"a":0,"k":[0,0,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":[70,70],"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":[0.172549024224,0.419607847929,0.929411768913,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"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":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":95,"s":[0]},{"t":106,"s":[0]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":-1,"s":[5.5]},{"t":95,"s":[100]}],"ix":2},"o":{"a":0,"k":1,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":189,"st":-1,"bm":0},{"ddd":0,"ind":3,"ty":3,"nm":"Rotator","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-1,"s":[0]},{"t":322,"s":[1444]}],"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":0,"op":189,"st":-1,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/app/src/main/res/raw/lottie_message_requests_splash.json b/app/src/main/res/raw/lottie_message_requests_splash.json deleted file mode 100644 index f557b5ee24..0000000000 --- a/app/src/main/res/raw/lottie_message_requests_splash.json +++ /dev/null @@ -1 +0,0 @@ -{"v":"5.5.2","fr":60,"ip":0,"op":180,"w":3000,"h":2000,"nm":"Bottom Message/MessagesSplash","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Top Sig/MessagesSplash Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1500,1000,0],"ix":2},"a":{"a":0,"k":[1500,1000,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-19.937,-5.042],[-25.036,0.234],[-23.398,2.557],[-28.481,-0.805],[-30.733,1.099],[-41.879,-19.716],[0.156,34.511],[10.567,2.858]],"o":[[52.885,-117.548],[31.867,8.059],[17.469,-0.162],[24.485,-2.676],[30.103,0.852],[29.409,-1.052],[53.056,24.979],[-0.167,-36.773],[0,0]],"v":[[-278.595,73.032],[-173.866,-72.008],[-112.538,40.682],[-66.635,-13.163],[-3.213,39.211],[67.32,-21.029],[143.654,52.071],[278.439,-2.471],[174.392,-68.093]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":53,"s":[0]},{"t":70,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.368999974868,0.368999974868,0.368999974868,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":38,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[1206.876,331.396],"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":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":186,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Top number/MessagesSplash Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":2,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":38,"s":[100]},{"t":43,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1500,1000,0],"ix":2},"a":{"a":0,"k":[1500,1000,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[95,95,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":8,"s":[101,101,100]},{"t":10,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[10.307,0],[0,10.248],[-10.068,0],[0,-10.073]],"o":[[-10.366,0],[0,-9.84],[10.018,0],[0,9.957]],"v":[[563.227,2.242],[545.697,-15.169],[563.337,-32.579],[580.927,-14.878]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-14.906,0],[0,28.473],[19.277,0],[0,-17.177],[-16.013,0],[-4.02,8.036],[0,0],[12.871,0],[1.985,6.697],[0,0]],"o":[[21.023,0],[0,-28.008],[-17.819,0],[0,16.13],[9.958,0],[0,0],[-0.35,20.438],[-7.682,0],[0,0],[2.504,13.567]],"v":[[562.639,44.05],[595.954,-1.135],[563.167,-44.05],[532.715,-14.703],[560.373,13.246],[582.384,0.553],[583.373,0.553],[562.758,32.462],[547.094,21.69],[533.934,21.69]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[10.306,0],[0,10.248],[-10.068,0],[0,-10.073]],"o":[[-10.366,0],[0,-9.84],[10.018,0],[0,9.957]],"v":[[488.695,2.242],[471.164,-15.169],[488.805,-32.579],[506.395,-14.878]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[-14.906,0],[0,28.473],[19.268,0],[0,-17.177],[-16.013,0],[-4.02,8.036],[0,0],[12.871,0],[1.977,6.697],[0,0]],"o":[[21.022,0],[0,-28.008],[-17.82,0],[0,16.13],[9.957,0],[0,0],[-0.348,20.438],[-7.684,0],[0,0],[2.505,13.567]],"v":[[488.107,44.05],[521.413,-1.135],[488.635,-44.05],[458.183,-14.703],[485.841,13.246],[507.851,0.553],[508.839,0.553],[488.226,32.462],[472.561,21.69],[459.401,21.69]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[10.306,0],[0,10.248],[-10.077,0],[0,-10.073]],"o":[[-10.359,0],[0,-9.84],[10.017,0],[0,9.957]],"v":[[414.154,2.242],[396.632,-15.169],[414.273,-32.579],[431.863,-14.878]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[-14.907,0],[0,28.473],[19.268,0],[0,-17.177],[-16.006,0],[-4.012,8.036],[0,0],[12.862,0],[1.976,6.697],[0,0]],"o":[[21.022,0],[0,-28.008],[-17.819,0],[0,16.13],[9.957,0],[0,0],[-0.35,20.438],[-7.692,0],[0,0],[2.504,13.567]],"v":[[413.574,44.05],[446.879,-1.135],[414.102,-44.05],[383.642,-14.703],[411.3,13.246],[433.31,0.553],[434.307,0.553],[413.693,32.462],[398.029,21.69],[384.869,21.69]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[10.306,0],[0,10.248],[-10.076,0],[0,-10.073]],"o":[[-10.367,0],[0,-9.84],[10.017,0],[0,9.957]],"v":[[339.621,2.242],[322.099,-15.169],[339.74,-32.579],[357.321,-14.878]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[-14.906,0],[0,28.473],[19.276,0],[0,-17.177],[-16.014,0],[-4.012,8.036],[0,0],[12.862,0],[1.975,6.697],[0,0]],"o":[[21.023,0],[0,-28.008],[-17.812,0],[0,16.13],[9.958,0],[0,0],[-0.35,20.438],[-7.692,0],[0,0],[2.505,13.567]],"v":[[339.041,44.05],[372.347,-1.135],[339.561,-44.05],[309.109,-14.703],[336.767,13.246],[358.778,0.553],[359.775,0.553],[339.161,32.462],[323.497,21.69],[310.335,21.69]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[10.307,0],[0,10.248],[-10.077,0],[0,-10.073]],"o":[[-10.366,0],[0,-9.84],[10.017,0],[0,9.957]],"v":[[265.088,2.242],[247.567,-15.169],[265.207,-32.579],[282.789,-14.878]],"c":true},"ix":2},"nm":"Path 9","mn":"ADBE Vector Shape - Group","hd":false},{"ind":9,"ty":"sh","ix":10,"ks":{"a":0,"k":{"i":[[-14.907,0],[0,28.473],[19.276,0],[0,-17.177],[-16.014,0],[-4.021,8.036],[0,0],[12.871,0],[1.977,6.697],[0,0]],"o":[[21.023,0],[0,-28.008],[-17.821,0],[0,16.13],[9.957,0],[0,0],[-0.349,20.438],[-7.684,0],[0,0],[2.504,13.567]],"v":[[264.509,44.05],[297.814,-1.135],[265.029,-44.05],[234.577,-14.703],[262.235,13.246],[284.246,0.553],[285.233,0.553],[264.62,32.462],[248.963,21.69],[235.803,21.69]],"c":true},"ix":2},"nm":"Path 10","mn":"ADBE Vector Shape - Group","hd":false},{"ind":10,"ty":"sh","ix":11,"ks":{"a":0,"k":{"i":[[10.307,0],[0,10.248],[-10.076,0],[0,-10.073]],"o":[[-10.366,0],[0,-9.84],[10.009,0],[0,9.957]],"v":[[161.441,2.242],[143.911,-15.169],[161.56,-32.579],[179.141,-14.878]],"c":true},"ix":2},"nm":"Path 11","mn":"ADBE Vector Shape - Group","hd":false},{"ind":11,"ty":"sh","ix":12,"ks":{"a":0,"k":{"i":[[-14.906,0],[0,28.473],[19.277,0],[0,-17.177],[-16.013,0],[-4.02,8.036],[0,0],[12.871,0],[1.984,6.697],[0,0]],"o":[[21.022,0],[0,-28.008],[-17.819,0],[0,16.13],[9.958,0],[0,0],[-0.349,20.438],[-7.682,0],[0,0],[2.504,13.567]],"v":[[160.853,44.05],[194.167,-1.135],[161.381,-44.05],[130.929,-14.703],[158.587,13.246],[180.598,0.553],[181.586,0.553],[160.972,32.462],[145.308,21.69],[132.148,21.69]],"c":true},"ix":2},"nm":"Path 12","mn":"ADBE Vector Shape - Group","hd":false},{"ind":12,"ty":"sh","ix":13,"ks":{"a":0,"k":{"i":[[10.306,0],[0,10.248],[-10.068,0],[0,-10.073]],"o":[[-10.368,0],[0,-9.84],[10.018,0],[0,9.957]],"v":[[86.909,2.242],[69.378,-15.169],[87.019,-32.579],[104.609,-14.878]],"c":true},"ix":2},"nm":"Path 13","mn":"ADBE Vector Shape - Group","hd":false},{"ind":13,"ty":"sh","ix":14,"ks":{"a":0,"k":{"i":[[-14.907,0],[0,28.473],[19.276,0],[0,-17.177],[-16.015,0],[-4.021,8.036],[0,0],[12.871,0],[1.985,6.697],[0,0]],"o":[[21.022,0],[0,-28.008],[-17.82,0],[0,16.13],[9.957,0],[0,0],[-0.348,20.438],[-7.684,0],[0,0],[2.505,13.567]],"v":[[86.321,44.05],[119.626,-1.135],[86.849,-44.05],[56.397,-14.703],[84.055,13.246],[106.065,0.553],[107.053,0.553],[86.44,32.462],[70.775,21.69],[57.615,21.69]],"c":true},"ix":2},"nm":"Path 14","mn":"ADBE Vector Shape - Group","hd":false},{"ind":14,"ty":"sh","ix":15,"ks":{"a":0,"k":{"i":[[10.299,0],[0,10.248],[-10.069,0],[0,-10.073]],"o":[[-10.366,0],[0,-9.84],[10.016,0],[0,9.957]],"v":[[12.375,2.242],[-5.155,-15.169],[12.487,-32.579],[30.076,-14.878]],"c":true},"ix":2},"nm":"Path 15","mn":"ADBE Vector Shape - Group","hd":false},{"ind":15,"ty":"sh","ix":16,"ks":{"a":0,"k":{"i":[[-14.907,0],[0,28.473],[19.267,0],[0,-17.177],[-16.014,0],[-4.021,8.036],[0,0],[12.87,0],[1.975,6.697],[0,0]],"o":[[21.022,0],[0,-28.008],[-17.819,0],[0,16.13],[9.958,0],[0,0],[-0.35,20.438],[-7.684,0],[0,0],[2.504,13.567]],"v":[[11.788,44.05],[45.093,-1.135],[12.316,-44.05],[-18.136,-14.703],[9.522,13.246],[31.533,0.553],[32.521,0.553],[11.908,32.462],[-3.757,21.69],[-16.918,21.69]],"c":true},"ix":2},"nm":"Path 16","mn":"ADBE Vector Shape - Group","hd":false},{"ind":16,"ty":"sh","ix":17,"ks":{"a":0,"k":{"i":[[10.307,0],[0,10.248],[-10.076,0],[0,-10.073]],"o":[[-10.367,0],[0,-9.84],[10.017,0],[0,9.957]],"v":[[-91.28,2.242],[-108.802,-15.169],[-91.161,-32.579],[-73.58,-14.878]],"c":true},"ix":2},"nm":"Path 17","mn":"ADBE Vector Shape - Group","hd":false},{"ind":17,"ty":"sh","ix":18,"ks":{"a":0,"k":{"i":[[-14.907,0],[0,28.473],[19.275,0],[0,-17.177],[-16.015,0],[-4.012,8.036],[0,0],[12.862,0],[1.977,6.697],[0,0]],"o":[[21.022,0],[0,-28.008],[-17.812,0],[0,16.13],[9.957,0],[0,0],[-0.349,20.438],[-7.692,0],[0,0],[2.504,13.567]],"v":[[-91.859,44.05],[-58.554,-1.135],[-91.339,-44.05],[-121.792,-14.703],[-94.133,13.246],[-72.123,0.553],[-71.135,0.553],[-91.74,32.462],[-107.405,21.69],[-120.565,21.69]],"c":true},"ix":2},"nm":"Path 18","mn":"ADBE Vector Shape - Group","hd":false},{"ind":18,"ty":"sh","ix":19,"ks":{"a":0,"k":{"i":[[10.307,0],[0,10.248],[-10.077,0],[0,-10.073]],"o":[[-10.366,0],[0,-9.84],[10.017,0],[0,9.957]],"v":[[-165.813,2.242],[-183.343,-15.169],[-165.693,-32.579],[-148.112,-14.878]],"c":true},"ix":2},"nm":"Path 19","mn":"ADBE Vector Shape - Group","hd":false},{"ind":19,"ty":"sh","ix":20,"ks":{"a":0,"k":{"i":[[-14.906,0],[0,28.473],[19.276,0],[0,-17.177],[-16.014,0],[-4.02,8.036],[0,0],[12.871,0],[1.976,6.697],[0,0]],"o":[[21.023,0],[0,-28.008],[-17.82,0],[0,16.13],[9.957,0],[0,0],[-0.349,20.438],[-7.683,0],[0,0],[2.505,13.567]],"v":[[-166.392,44.05],[-133.086,-1.135],[-165.872,-44.05],[-196.324,-14.703],[-168.666,13.246],[-146.656,0.553],[-145.668,0.553],[-166.281,32.462],[-181.937,21.69],[-195.098,21.69]],"c":true},"ix":2},"nm":"Path 20","mn":"ADBE Vector Shape - Group","hd":false},{"ind":20,"ty":"sh","ix":21,"ks":{"a":0,"k":{"i":[[10.306,0],[0,10.248],[-10.077,0],[0,-10.073]],"o":[[-10.366,0],[0,-9.84],[10.009,0],[0,9.957]],"v":[[-240.345,2.242],[-257.875,-15.169],[-240.226,-32.579],[-222.645,-14.878]],"c":true},"ix":2},"nm":"Path 21","mn":"ADBE Vector Shape - Group","hd":false},{"ind":21,"ty":"sh","ix":22,"ks":{"a":0,"k":{"i":[[-14.907,0],[0,28.473],[19.277,0],[0,-17.177],[-16.013,0],[-4.021,8.036],[0,0],[12.871,0],[1.984,6.697],[0,0]],"o":[[21.013,0],[0,-28.008],[-17.82,0],[0,16.13],[9.958,0],[0,0],[-0.349,20.438],[-7.683,0],[0,0],[2.505,13.567]],"v":[[-240.924,44.05],[-207.619,-1.135],[-240.405,-44.05],[-270.856,-14.703],[-243.199,13.246],[-221.188,0.553],[-220.2,0.553],[-240.814,32.462],[-256.478,21.69],[-269.639,21.69]],"c":true},"ix":2},"nm":"Path 22","mn":"ADBE Vector Shape - Group","hd":false},{"ind":22,"ty":"sh","ix":23,"ks":{"a":0,"k":{"i":[[10.306,0],[0,10.248],[-10.068,0],[0,-10.073]],"o":[[-10.367,0],[0,-9.84],[10.018,0],[0,9.957]],"v":[[-343.992,2.242],[-361.523,-15.169],[-343.882,-32.579],[-326.292,-14.878]],"c":true},"ix":2},"nm":"Path 23","mn":"ADBE Vector Shape - Group","hd":false},{"ind":23,"ty":"sh","ix":24,"ks":{"a":0,"k":{"i":[[-14.907,0],[0,28.473],[19.276,0],[0,-17.177],[-16.014,0],[-4.021,8.036],[0,0],[12.871,0],[1.985,6.697],[0,0]],"o":[[21.022,0],[0,-28.008],[-17.82,0],[0,16.13],[9.958,0],[0,0],[-0.349,20.438],[-7.683,0],[0,0],[2.504,13.567]],"v":[[-344.58,44.05],[-311.275,-1.135],[-344.052,-44.05],[-374.504,-14.703],[-346.846,13.246],[-324.835,0.553],[-323.847,0.553],[-344.461,32.462],[-360.126,21.69],[-373.286,21.69]],"c":true},"ix":2},"nm":"Path 24","mn":"ADBE Vector Shape - Group","hd":false},{"ind":24,"ty":"sh","ix":25,"ks":{"a":0,"k":{"i":[[10.298,0],[0,10.248],[-10.068,0],[0,-10.073]],"o":[[-10.367,0],[0,-9.84],[10.017,0],[0,9.957]],"v":[[-418.525,2.242],[-436.055,-15.169],[-418.414,-32.579],[-400.825,-14.878]],"c":true},"ix":2},"nm":"Path 25","mn":"ADBE Vector Shape - Group","hd":false},{"ind":25,"ty":"sh","ix":26,"ks":{"a":0,"k":{"i":[[-14.906,0],[0,28.473],[19.268,0],[0,-17.177],[-16.015,0],[-4.021,8.036],[0,0],[12.871,0],[1.976,6.697],[0,0]],"o":[[21.023,0],[0,-28.008],[-17.819,0],[0,16.13],[9.948,0],[0,0],[-0.349,20.438],[-7.691,0],[0,0],[2.504,13.567]],"v":[[-419.113,44.05],[-385.807,-1.135],[-418.585,-44.05],[-449.045,-14.703],[-421.378,13.246],[-399.368,0.553],[-398.38,0.553],[-418.994,32.462],[-434.658,21.69],[-447.818,21.69]],"c":true},"ix":2},"nm":"Path 26","mn":"ADBE Vector Shape - Group","hd":false},{"ind":26,"ty":"sh","ix":27,"ks":{"a":0,"k":{"i":[[10.307,0],[0,10.248],[-10.077,0],[0,-10.073]],"o":[[-10.358,0],[0,-9.84],[10.017,0],[0,9.957]],"v":[[-493.066,2.242],[-510.588,-15.169],[-492.947,-32.579],[-475.366,-14.878]],"c":true},"ix":2},"nm":"Path 27","mn":"ADBE Vector Shape - Group","hd":false},{"ind":27,"ty":"sh","ix":28,"ks":{"a":0,"k":{"i":[[-14.906,0],[0,28.473],[19.267,0],[0,-17.177],[-16.006,0],[-4.012,8.036],[0,0],[12.862,0],[1.977,6.697],[0,0]],"o":[[21.023,0],[0,-28.008],[-17.82,0],[0,16.13],[9.957,0],[0,0],[-0.349,20.438],[-7.692,0],[0,0],[2.504,13.567]],"v":[[-493.646,44.05],[-460.34,-1.135],[-493.117,-44.05],[-523.578,-14.703],[-495.919,13.246],[-473.909,0.553],[-472.913,0.553],[-493.526,32.462],[-509.191,21.69],[-522.351,21.69]],"c":true},"ix":2},"nm":"Path 28","mn":"ADBE Vector Shape - Group","hd":false},{"ind":28,"ty":"sh","ix":29,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-561.367,14.644],[-538.194,14.644],[-538.194,2.591],[-561.367,2.591],[-561.367,-21.573],[-572.837,-21.573],[-572.837,2.591],[-595.954,2.591],[-595.954,14.644],[-572.837,14.644],[-572.837,38.809],[-561.367,38.809]],"c":true},"ix":2},"nm":"Path 29","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.725,0.725,0.725,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":[1514.439,361.727],"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":"Group 1","np":31,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":186,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Top Message/MessagesSplash Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":2,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1500,1000,0],"ix":2},"a":{"a":0,"k":[1500,1000,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[95,95,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":8,"s":[101,101,100]},{"t":10,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-13.307,7.364],[-3.724,2.676],[-0.646,12.757],[13.154,-5.511],[27.691,0],[0.139,1.895],[-20.186,10.628],[-12.166,11.069],[0,23.281],[52.427,4.483],[30.52,-12.729],[14.092,-42.971],[-51.509,-32.252],[-0.529,-0.316],[-10.809,15.209],[0,13.057],[-25.801,0],[-1.838,-0.219],[-12.549,-37.792],[-3.601,-4.408],[-21.804,5.604],[-7.978,22.876],[6.348,-0.012],[0,9.842]],"o":[[5.132,-2.84],[1.635,-11.758],[-8.028,0.09],[-20.057,8.401],[-45.739,0],[16.163,-23.993],[43.498,0.685],[10.809,-9.835],[-13.269,-9.465],[-26.746,-7.631],[-37.678,10.657],[-50.466,86.827],[0.528,0.331],[13.881,-16.395],[-8.682,-8.457],[0,-25.721],[1.896,0],[1.161,32.158],[1.771,5.332],[47.078,26.558],[14.392,-3.699],[-0.463,-3.952],[-8.604,0.017],[0,-10.729]],"v":[[163.921,115.169],[177.672,106.943],[181.092,70.018],[148.958,80.202],[76.042,99.146],[19.28,-49.85],[71.146,-102.772],[149.97,-116.953],[162.911,-165.645],[50.399,-195.531],[-38.55,-188.998],[-130.626,-121.417],[-83.943,96.818],[-82.36,97.798],[-45.557,50.304],[-59.629,16.988],[-12.914,-29.583],[-7.311,-29.253],[11.176,149.496],[19.353,164.083],[133.147,197.557],[166.682,155.234],[154.236,151.296],[135.743,141.49]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.097999999102,0.093999997307,0.277999997606,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":[497.075,505.5],"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":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[14.724,0],[0.08,0],[1.635,-11.759],[-1.181,1.649]],"o":[[-0.079,0],[-0.645,12.758],[2.301,-1.654],[9.76,-13.62]],"v":[[-5.531,-18.467],[-5.774,-18.458],[-9.193,18.467],[-3.855,13.524]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.097999999102,0.093999997307,0.277999997606,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":[683.941,593.976],"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":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[14.393,-3.698],[47.078,26.558],[-26.507,0],[0.636,17.597],[0,2.152],[0.02,0.174]],"o":[[-21.804,5.604],[26.488,32.425],[26.009,0],[-0.09,-2.534],[0,-0.188],[-7.978,22.877]],"v":[[39.257,17.445],[-74.537,-16.03],[48.528,24.878],[73.014,-17.271],[72.837,-24.347],[72.792,-24.878]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.097999999102,0.093999997307,0.277999997606,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":[590.965,685.612],"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":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[43.499,0.685],[16.162,-23.993],[-45.738,0],[-20.057,8.401],[-8.028,0.09],[22.832,42.428],[0.601,1.002]],"o":[[-20.186,10.628],[0.138,1.895],[27.692,0],[13.155,-5.511],[3.344,-66.096],[-0.547,-1.016],[-12.166,11.069]],"v":[[-30.712,-93.869],[-82.578,-40.947],[-25.816,108.049],[47.099,89.105],[79.234,78.922],[49.843,-105.023],[48.112,-108.049]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8,0.654999976065,0.517999985639,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":[598.933,496.596],"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":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-10.729],[-8.604,0.017],[-0.462,-3.952],[-2.5,17.985],[5.132,-2.84]],"o":[[0,9.842],[6.348,-0.012],[4.83,-13.847],[-3.724,2.675],[-13.307,7.364]],"v":[[-20.964,10.401],[-2.471,20.207],[9.974,24.146],[20.964,-24.146],[7.214,-15.919]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8,0.654999976065,0.517999985639,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":[653.783,636.588],"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":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-3.13,-1.766],[1.771,5.332],[1.161,32.158],[1.896,0],[0,-25.721],[-8.682,-8.457],[13.881,-16.395],[0.527,0.331],[0,0],[-48.765,-1.43],[0,0]],"o":[[-3.601,-4.408],[-12.549,-37.792],[-1.837,-0.219],[-25.8,0],[0,13.057],[-10.809,15.209],[-0.528,-0.316],[0,0],[39.09,23.8],[0,0],[3.143,1.889]],"v":[[62.328,50.942],[54.151,36.357],[35.664,-142.393],[30.061,-142.725],[-16.655,-96.153],[-2.581,-62.836],[-39.385,-15.341],[-40.967,-16.322],[-66.703,103.263],[66.703,142.725],[52.914,45.46]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8,0.654999976065,0.517999985639,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":[454.1,618.64],"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":"Group 6","np":2,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,150.54],[150.54,0],[0,-150.54],[-78.562,-47.832],[0,0],[-0.528,-0.316],[-10.809,15.209],[0,13.057],[-25.801,0],[-1.838,-0.219],[-12.549,-37.792],[-3.601,-4.408],[3.143,1.889],[0,0],[-2.724,0]],"o":[[0,-150.54],[-150.539,0],[0,98.704],[0,0],[0.528,0.331],[13.881,-16.395],[-8.683,-8.457],[0,-25.721],[1.896,0],[1.161,32.158],[1.771,5.332],[-3.131,-1.766],[0,0],[2.706,0.08],[150.54,0]],"v":[[272.576,-0.001],[-0.001,-272.576],[-272.577,-0.001],[-141.55,232.983],[-115.815,113.398],[-114.232,114.378],[-77.428,66.884],[-91.501,33.568],[-44.786,-13.003],[-39.183,-12.673],[-20.696,166.076],[-12.519,180.663],[-21.933,175.18],[-8.143,272.445],[-0.001,272.576]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.870999983245,0.870999983245,0.870999983245,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":[528.946,488.919],"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":"Group 7","np":2,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-28.226,0],[0,0],[0,-28.226],[28.227,0],[0,0],[0,28.226]],"o":[[0,0],[28.227,0],[0,28.226],[0,0],[-28.226,0],[0,-28.226]],"v":[[-868.837,-51.108],[868.836,-51.108],[919.945,0],[868.836,51.108],[-868.837,51.108],[-919.945,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.870999983245,0.870999983245,0.870999983245,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":[1823.685,522.991],"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":"Group 8","np":2,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-28.226,0],[0,0],[0,-28.226],[28.225,0],[0,0],[0,28.226]],"o":[[0,0],[28.225,0],[0,28.226],[0,0],[-28.226,0],[0,-28.226]],"v":[[-489.785,-51.108],[489.786,-51.108],[540.893,0],[489.786,51.108],[-489.785,51.108],[-540.893,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.870999983245,0.870999983245,0.870999983245,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":[1444.633,667.797],"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":"Group 9","np":2,"cix":2,"bm":0,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-136.427,0],[0,0],[0,-136.426],[0,0],[136.427,0],[0,0],[0,136.427],[0,0]],"o":[[0,0],[136.427,0],[0,0],[0,136.427],[0,0],[-136.427,0],[0,0],[0,-136.426]],"v":[[-1132.896,-442.937],[1132.896,-442.937],[1379.917,-195.915],[1379.917,195.914],[1132.896,442.937],[-1132.896,442.937],[-1379.917,195.914],[-1379.917,-195.915]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.964999988032,0.964999988032,0.964999988032,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":[1500,488.919],"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":"Group 10","np":2,"cix":2,"bm":0,"ix":10,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":186,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Bottom Sig/MessagesSplash Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1500,1000,0],"ix":2},"a":{"a":0,"k":[1500,1000,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[43.915,14.099],[-6.08,-32.885],[-5.807,4.098],[13.2,5.381],[32.846,6.051],[25.705,5.235],[44.951,-22.135],[47.929,26.538],[6.138,12.409]],"o":[[23.643,-68.399],[-55.125,-17.698],[3.162,17.106],[5.509,-3.888],[-22.129,-9.025],[-25.234,-4.648],[-23.915,-4.87],[-10.233,5.04],[-20.616,-11.415],[0,0]],"v":[[248.427,82.241],[196.323,-65.03],[75.637,13.125],[109.131,41.303],[96.371,6.214],[15.028,47.151],[-35.48,1.428],[-114.698,47.682],[-233.791,56.189],[-272.07,14.188]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":113,"s":[0]},{"t":131,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.368999974868,0.368999974868,0.368999974868,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":38,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[1785.07,1347.455],"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":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":186,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Bottom number/MessagesSplash Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":16,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":18,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":100,"s":[100]},{"t":103,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1500,1000,0],"ix":2},"a":{"a":0,"k":[1500,1000,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":0,"s":[95,95,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":16,"s":[95,95,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":24,"s":[101,101,100]},{"t":26,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-16.712,0],[0,17.589],[14.208,0],[3.842,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.454,0],[0,-10.366],[10.196,0],[0.929,8.152],[0,0]],"o":[[17.812,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.083,-5.647],[9.898,0],[0,10.657],[-9.14,0],[0,0],[0.818,14.668]],"v":[[549.782,43.029],[579.645,13.506],[553.794,-14.153],[535.224,-6.171],[534.228,-6.171],[536.681,-31.444],[575.285,-31.444],[575.285,-43.029],[526.545,-43.029],[521.826,5.592],[533.768,5.592],[550.191,-3.496],[566.893,13.803],[549.833,31.564],[532.95,18.054],[520.488,18.054]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-16.713,0],[0,17.589],[14.208,0],[3.842,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.454,0],[0,-10.366],[10.187,0],[0.937,8.152],[0,0]],"o":[[17.819,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.083,-5.647],[9.898,0],[0,10.657],[-9.14,0],[0,0],[0.818,14.668]],"v":[[477.575,43.029],[507.447,13.506],[481.595,-14.153],[463.017,-6.171],[462.029,-6.171],[464.474,-31.444],[503.078,-31.444],[503.078,-43.029],[454.338,-43.029],[449.627,5.592],[461.561,5.592],[477.984,-3.496],[494.696,13.803],[477.635,31.564],[460.743,18.054],[448.281,18.054]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[-16.713,0],[0,17.589],[14.208,0],[3.842,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.453,0],[0,-10.366],[10.187,0],[0.928,8.152],[0,0]],"o":[[17.819,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.092,-5.647],[9.899,0],[0,10.657],[-9.14,0],[0,0],[0.808,14.668]],"v":[[405.368,43.029],[435.24,13.506],[409.388,-14.153],[390.81,-6.171],[389.822,-6.171],[392.267,-31.444],[430.871,-31.444],[430.871,-43.029],[382.139,-43.029],[377.42,5.592],[389.354,5.592],[405.776,-3.496],[422.489,13.803],[405.428,31.564],[388.545,18.054],[376.083,18.054]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[-16.712,0],[0,17.589],[14.208,0],[3.841,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.453,0],[0,-10.366],[10.196,0],[0.927,8.152],[0,0]],"o":[[17.811,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.083,-5.647],[9.899,0],[0,10.657],[-9.14,0],[0,0],[0.817,14.668]],"v":[[333.169,43.029],[363.033,13.506],[337.181,-14.153],[318.612,-6.171],[317.615,-6.171],[320.059,-31.444],[358.672,-31.444],[358.672,-43.029],[309.931,-43.029],[305.213,5.592],[317.155,5.592],[333.569,-3.496],[350.282,13.803],[333.22,31.564],[316.338,18.054],[303.876,18.054]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[-16.712,0],[0,17.589],[14.208,0],[3.842,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.453,0],[0,-10.366],[10.188,0],[0.937,8.152],[0,0]],"o":[[17.819,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.083,-5.647],[9.897,0],[0,10.657],[-9.148,0],[0,0],[0.817,14.668]],"v":[[260.962,43.029],[290.835,13.506],[264.973,-14.153],[246.404,-6.171],[245.417,-6.171],[247.861,-31.444],[286.465,-31.444],[286.465,-43.029],[237.724,-43.029],[233.014,5.592],[244.948,5.592],[261.371,-3.496],[278.083,13.803],[261.021,31.564],[244.13,18.054],[231.669,18.054]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[-16.712,0],[0,17.589],[14.208,0],[3.842,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.454,0],[0,-10.366],[10.187,0],[0.938,8.152],[0,0]],"o":[[17.82,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.084,-5.647],[9.898,0],[0,10.657],[-9.141,0],[0,0],[0.818,14.668]],"v":[[159.64,43.029],[189.512,13.506],[163.661,-14.153],[145.083,-6.171],[144.095,-6.171],[146.539,-31.444],[185.142,-31.444],[185.142,-43.029],[136.403,-43.029],[131.692,5.592],[143.626,5.592],[160.049,-3.496],[176.761,13.803],[159.7,31.564],[142.808,18.054],[130.346,18.054]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[-16.712,0],[0,17.589],[14.208,0],[3.842,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.454,0],[0,-10.366],[10.188,0],[0.928,8.152],[0,0]],"o":[[17.821,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.092,-5.647],[9.898,0],[0,10.657],[-9.14,0],[0,0],[0.809,14.668]],"v":[[87.432,43.029],[117.305,13.506],[91.453,-14.153],[72.876,-6.171],[71.887,-6.171],[74.332,-31.444],[112.935,-31.444],[112.935,-43.029],[64.204,-43.029],[59.485,5.592],[71.419,5.592],[87.842,-3.496],[104.553,13.803],[87.492,31.564],[70.61,18.054],[58.148,18.054]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[-16.703,0],[0,17.589],[14.208,0],[3.841,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.454,0],[0,-10.366],[10.196,0],[0.928,8.152],[0,0]],"o":[[17.821,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.083,-5.647],[9.897,0],[0,10.657],[-9.14,0],[0,0],[0.818,14.668]],"v":[[15.225,43.029],[45.098,13.506],[19.246,-14.153],[0.677,-6.171],[-0.32,-6.171],[2.125,-31.444],[40.737,-31.444],[40.737,-43.029],[-8.003,-43.029],[-12.722,5.592],[-0.78,5.592],[15.635,-3.496],[32.346,13.803],[15.285,31.564],[-1.597,18.054],[-14.059,18.054]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[-16.712,0],[0,17.589],[14.208,0],[3.842,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.453,0],[0,-10.366],[10.196,0],[0.928,8.152],[0,0]],"o":[[17.811,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.084,-5.647],[9.898,0],[0,10.657],[-9.139,0],[0,0],[0.818,14.668]],"v":[[-86.088,43.029],[-56.223,13.506],[-82.075,-14.153],[-100.645,-6.171],[-101.642,-6.171],[-99.188,-31.444],[-60.585,-31.444],[-60.585,-43.029],[-109.325,-43.029],[-114.044,5.592],[-102.102,5.592],[-85.679,-3.496],[-68.975,13.803],[-86.037,31.564],[-102.919,18.054],[-115.381,18.054]],"c":true},"ix":2},"nm":"Path 9","mn":"ADBE Vector Shape - Group","hd":false},{"ind":9,"ty":"sh","ix":10,"ks":{"a":0,"k":{"i":[[-16.712,0],[0,17.589],[14.209,0],[3.842,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.453,0],[0,-10.366],[10.187,0],[0.937,8.152],[0,0]],"o":[[17.82,0],[0,-16.764],[-8.5,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.084,-5.647],[9.898,0],[0,10.657],[-9.14,0],[0,0],[0.817,14.668]],"v":[[-158.295,43.029],[-128.422,13.506],[-154.275,-14.153],[-172.852,-6.171],[-173.84,-6.171],[-171.396,-31.444],[-132.792,-31.444],[-132.792,-43.029],[-181.532,-43.029],[-186.242,5.592],[-174.309,5.592],[-157.886,-3.496],[-141.174,13.803],[-158.235,31.564],[-175.127,18.054],[-187.588,18.054]],"c":true},"ix":2},"nm":"Path 10","mn":"ADBE Vector Shape - Group","hd":false},{"ind":10,"ty":"sh","ix":11,"ks":{"a":0,"k":{"i":[[-16.713,0],[0,17.589],[14.208,0],[3.841,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.454,0],[0,-10.366],[10.188,0],[0.928,8.152],[0,0]],"o":[[17.82,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.092,-5.647],[9.897,0],[0,10.657],[-9.139,0],[0,0],[0.809,14.668]],"v":[[-230.502,43.029],[-200.629,13.506],[-226.482,-14.153],[-245.059,-6.171],[-246.048,-6.171],[-243.603,-31.444],[-204.999,-31.444],[-204.999,-43.029],[-253.731,-43.029],[-258.45,5.592],[-246.516,5.592],[-230.093,-3.496],[-213.381,13.803],[-230.443,31.564],[-247.325,18.054],[-259.787,18.054]],"c":true},"ix":2},"nm":"Path 11","mn":"ADBE Vector Shape - Group","hd":false},{"ind":11,"ty":"sh","ix":12,"ks":{"a":0,"k":{"i":[[-16.712,0],[0,17.589],[14.208,0],[3.85,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.453,0],[0,-10.366],[10.196,0],[0.929,8.152],[0,0]],"o":[[17.82,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.092,-5.647],[9.898,0],[0,10.657],[-9.14,0],[0,0],[0.818,14.668]],"v":[[-331.824,43.029],[-301.951,13.506],[-327.803,-14.153],[-346.381,-6.171],[-347.369,-6.171],[-344.925,-31.444],[-306.312,-31.444],[-306.312,-43.029],[-355.052,-43.029],[-359.771,5.592],[-347.838,5.592],[-331.415,-3.496],[-314.703,13.803],[-331.764,31.564],[-348.647,18.054],[-361.109,18.054]],"c":true},"ix":2},"nm":"Path 12","mn":"ADBE Vector Shape - Group","hd":false},{"ind":12,"ty":"sh","ix":13,"ks":{"a":0,"k":{"i":[[-16.712,0],[0,17.589],[14.208,0],[3.842,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.453,0],[0,-10.366],[10.196,0],[0.928,8.152],[0,0]],"o":[[17.812,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.083,-5.647],[9.898,0],[0,10.657],[-9.14,0],[0,0],[0.818,14.668]],"v":[[-404.023,43.029],[-374.158,13.506],[-400.01,-14.153],[-418.58,-6.171],[-419.576,-6.171],[-417.123,-31.444],[-378.52,-31.444],[-378.52,-43.029],[-427.26,-43.029],[-431.979,5.592],[-420.036,5.592],[-403.614,-3.496],[-386.91,13.803],[-403.971,31.564],[-420.854,18.054],[-433.316,18.054]],"c":true},"ix":2},"nm":"Path 13","mn":"ADBE Vector Shape - Group","hd":false},{"ind":13,"ty":"sh","ix":14,"ks":{"a":0,"k":{"i":[[-16.712,0],[0,17.589],[14.208,0],[3.841,-5.128],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-7.453,0],[0,-10.366],[10.187,0],[0.937,8.152],[0,0]],"o":[[17.82,0],[0,-16.764],[-8.501,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.083,-5.647],[9.898,0],[0,10.657],[-9.14,0],[0,0],[0.818,14.668]],"v":[[-476.23,43.029],[-446.357,13.506],[-472.209,-14.153],[-490.787,-6.171],[-491.775,-6.171],[-489.33,-31.444],[-450.727,-31.444],[-450.727,-43.029],[-499.467,-43.029],[-504.177,5.592],[-492.243,5.592],[-475.821,-3.496],[-459.109,13.803],[-476.17,31.564],[-493.061,18.054],[-505.523,18.054]],"c":true},"ix":2},"nm":"Path 14","mn":"ADBE Vector Shape - Group","hd":false},{"ind":14,"ty":"sh","ix":15,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-545.058,13.625],[-521.883,13.625],[-521.883,1.572],[-545.058,1.572],[-545.058,-22.594],[-556.529,-22.594],[-556.529,1.572],[-579.645,1.572],[-579.645,13.625],[-556.529,13.625],[-556.529,37.791],[-545.058,37.791]],"c":true},"ix":2},"nm":"Path 15","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.725,0.725,0.725,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":[1488.88,1384.907],"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":"Group 1","np":17,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":186,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Bottom Message/MessagesSplash Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":16,"s":[0]},{"t":18,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1500,1000,0],"ix":2},"a":{"a":0,"k":[1500,1000,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":16,"s":[95,95,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":24,"s":[101,101,100]},{"t":26,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-12.981,3.961],[-7.93,-0.911],[-1.456,11.729],[-4.703,10.17],[-3.662,3.586],[-4.958,1.15],[-5.076,-1.073],[-2.206,-0.572],[-1.644,1.423],[-5,0.606],[-5.341,-1.849],[-3.765,-4.242],[-0.988,-2.377],[-0.972,-0.358],[-0.929,-0.315],[-4.182,-8.91],[0.316,-10.256],[8.655,-9.762],[10.963,-2.522],[-3.577,-10.572],[-0.886,-12.155],[2.709,-11.312],[9.038,-5.503],[4.48,-1.738],[4.626,-0.954],[6.746,6.977],[1.772,3.066],[-0.775,1.082],[-1.192,1.014],[-1.065,9.14],[9.012,4.046],[9.898,-5.349],[13.535,6.805],[15.384,6.465],[2.947,3.432],[0.493,1.9],[-1.244,1.942]],"o":[[12.99,-3.961],[-4.515,-10.817],[1.423,-11.398],[2.171,-4.694],[3.741,-3.654],[5.077,-1.176],[2.249,0.469],[2.258,0.587],[3.943,-3.425],[5.606,-0.673],[5.205,1.788],[1.67,1.89],[0.401,0.97],[0.902,0.324],[8.977,3.041],[2.436,5.195],[-0.315,10.255],[-7.726,8.705],[7.274,8.313],[3.893,11.49],[0.851,11.551],[-2.53,10.571],[-4.14,2.522],[-4.412,1.704],[-8.757,1.805],[-2.428,-2.512],[-0.639,-1.107],[0.929,-1.295],[6.798,-5.767],[1.074,-9.285],[-11.133,-5],[-4.199,-14.856],[-14.975,-7.538],[-4.012,-1.687],[-1.235,-1.44],[-0.647,-2.495],[6.577,-10.307]],"v":[[-62.902,-35.401],[-23.131,-39.797],[-27.978,-74.396],[-16.759,-105.673],[-8.464,-118.613],[4.961,-125.828],[20.421,-125.837],[26.895,-123.766],[31.887,-126.015],[46.622,-131.74],[63.386,-129.72],[77.356,-120.767],[81.538,-114.345],[82.978,-112.438],[85.857,-111.782],[106.683,-92.897],[109.954,-68.297],[91.734,-21.525],[61.691,-4.547],[77.39,24.737],[84.571,60.317],[82.79,95.393],[65.805,120.138],[52.73,126.288],[39.263,130.607],[13.675,125.129],[6.801,116.391],[6.554,113.486],[10.174,110.189],[22.244,87.582],[11.81,62.267],[-21.479,68.358],[-47.85,33.323],[-95.398,18.433],[-106.446,11.406],[-109.623,6.209],[-107.417,-0.315]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.097999999102,0.093999997307,0.277999997606,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":[2486.019,1418.711],"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":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-6.712,12.121],[34.131,10.442],[21.134,-4.685],[24.48,0],[3.62,-3.842],[0,0],[0,0],[0.329,-0.551],[-0.043,-4.471],[1.705,-6.255],[13.595,-64.535],[-6.952,-0.809],[-10.765,0],[-29.405,10.851],[-16.096,10.215],[9.094,13.084]],"o":[[31.942,-57.675],[-18.775,-5.732],[-17.3,3.842],[-9.03,0],[0,0],[0,0],[-0.395,0.507],[-1.959,3.279],[-1.248,4.45],[-8.979,32.965],[6.783,1.322],[10.439,1.213],[33.174,0],[18.149,-6.698],[-9.397,-15.325],[10.98,-3.177]],"v":[[82.887,-0.699],[69.157,-100.572],[11.6,-97.702],[-49.806,-89.508],[-68.401,-83.357],[-69.023,-83.315],[-69.33,-82.275],[-70.407,-80.682],[-73.137,-68.911],[-77.59,-52.794],[-114.829,101.248],[-94.223,104.447],[-62.406,106.305],[31.959,89.52],[83.441,64.03],[55.595,21.397]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.607999973671,0.128999986836,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":[2536.459,1681.263],"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":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.184,-5.293],[14.153,-45.346],[-13.562,-2.643],[-8.98,32.965],[-1.248,4.45],[-1.959,3.279]],"o":[[0,5.377],[-1.824,52.403],[12.762,4.574],[13.594,-64.535],[1.704,-6.255],[-0.043,-4.471],[0,0]],"v":[[-15.127,-82.004],[-15.415,-66.003],[-41.974,80.106],[-2.448,90.966],[34.791,-63.076],[39.243,-79.193],[41.974,-90.965]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.626999978458,0.658999992819,0.685999971278,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":[2424.079,1691.545],"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":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[11.831,3.048],[-22.939,42.795],[-5.945,-84.797],[18.254,-21.431],[0,0],[0,0]],"o":[[-25.64,15.469],[-29.651,-7.65],[22.948,-42.803],[2.061,29.437],[0,0],[0,0],[0,0]],"v":[[8.054,43.318],[-54.614,63.208],[-64.052,-95.807],[82.808,-72.466],[54.273,4.663],[86.99,157.264],[-8.046,157.264]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.470999983245,0.286000001197,0.19199999641,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":[2449.63,1525.736],"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":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.424,-0.806],[-1.287,-0.272],[0.802,1.142]],"o":[[1.259,0.301],[-0.906,-1.072],[-0.413,0.834]],"v":[[-1.909,0.801],[1.909,1.66],[-0.653,-1.66]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.626999978458,0.658999992819,0.685999971278,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":[2425.018,1844.267],"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":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.824,52.403],[26.859,-42.402],[-22.088,-7.914]],"o":[[-33.349,32.521],[19.032,13.036],[14.153,-45.346]],"v":[[44.224,-73.054],[-44.223,41.424],[17.665,73.055]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.910000011968,0.463000009574,0.075,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":[2364.44,1698.596],"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":"Group 6","np":2,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,96.89],[150.54,0],[0,-150.54],[-71.693,-49.106],[-33.348,32.521],[0,5.377],[0,0],[-0.396,0.507],[0,0],[0,0],[-9.029,0],[-17.3,3.842],[-18.774,-5.732],[31.942,-57.675],[10.98,-3.177],[-9.397,-15.324]],"o":[[0,-150.54],[-150.54,0],[0,93.46],[26.859,-42.401],[0.184,-5.293],[0,0],[0.329,-0.551],[0,0],[0,0],[3.62,-3.842],[24.481,0],[21.133,-4.684],[34.132,10.443],[-6.712,12.121],[9.094,13.084],[76.168,-48.338]],"v":[[272.577,21.138],[0,-251.439],[-272.576,21.138],[-153.836,246.166],[-65.389,131.689],[-65.102,115.688],[-8,106.727],[-6.923,105.134],[-6.616,104.094],[-5.994,104.052],[12.6,97.902],[74.007,89.707],[131.562,86.837],[145.293,186.71],[118.001,208.806],[145.848,251.439]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.870999983245,0.870999983245,0.870999983245,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":[2474.053,1493.853],"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":"Group 7","np":2,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[28.226,0],[0,0],[0,-28.226],[-28.226,0],[0,0],[0,28.226]],"o":[[0,0],[-28.226,0],[0,28.226],[0,0],[28.226,0],[0,-28.226]],"v":[[800.694,-51.108],[-800.693,-51.108],[-851.801,0],[-800.693,51.108],[800.694,51.108],[851.801,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.870999983245,0.870999983245,0.870999983245,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":[1244.459,1545.153],"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":"Group 8","np":2,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[28.226,0],[0,0],[0,-28.226],[-28.226,0],[0,0],[0,28.227]],"o":[[0,0],[-28.226,0],[0,28.227],[0,0],[28.226,0],[0,-28.226]],"v":[[587.744,-51.109],[-587.742,-51.109],[-638.85,0],[-587.742,51.109],[587.744,51.109],[638.85,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.870999983245,0.870999983245,0.870999983245,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":[1457.41,1689.959],"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":"Group 9","np":2,"cix":2,"bm":0,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[136.427,0],[0,0],[0,-136.425],[0,0],[-136.427,0],[0,0],[0,136.426],[0,0]],"o":[[0,0],[-136.427,0],[0,0],[0,136.426],[0,0],[136.427,0],[0,0],[0,-136.425]],"v":[[1132.896,-442.937],[-1132.896,-442.937],[-1379.917,-195.916],[-1379.917,195.914],[-1132.896,442.936],[1132.896,442.936],[1379.917,195.914],[1379.917,-195.916]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.964999988032,0.964999988032,0.964999988032,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":[1500,1511.081],"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":"Group 10","np":2,"cix":2,"bm":0,"ix":10,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":185,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 11ff54c628..7902f5c912 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -2,15 +2,6 @@ 5 - 12dp - 10dp - 17dp - 131dp - 94dp - 31dp - 20sp - 16sp - 16dp 8dp 16dp diff --git a/app/src/main/res/values-night/dark_themes.xml b/app/src/main/res/values-night/dark_themes.xml index 0bbea874ee..09ca4376aa 100644 --- a/app/src/main/res/values-night/dark_themes.xml +++ b/app/src/main/res/values-night/dark_themes.xml @@ -6,8 +6,6 @@ - - \ No newline at end of file diff --git a/app/src/main/res/values-v21/text_styles.xml b/app/src/main/res/values-v21/text_styles.xml index 8abf710ca3..8b6b460917 100644 --- a/app/src/main/res/values-v21/text_styles.xml +++ b/app/src/main/res/values-v21/text_styles.xml @@ -1,9 +1,5 @@ - - - - - - - - - diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml index c81251a889..ce84836440 100644 --- a/app/src/main/res/values-v23/themes.xml +++ b/app/src/main/res/values-v23/themes.xml @@ -34,12 +34,6 @@ @color/signal_colorBackground - - - - - - - - - - - - - - - - - - - - @@ -229,36 +186,6 @@ 1.25 - - - - - - - - @@ -331,27 +253,6 @@ 0dp - - - - - - - - - - - - @@ -443,25 +332,6 @@ textStart - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -229,12 +175,6 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index e8ea5d13ef..59106d4136 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -19,14 +19,6 @@ - - - - - - - - - - - - - @@ -421,10 +398,6 @@ - - @@ -506,14 +479,6 @@ 10dp - -