diff --git a/app/build.gradle b/app/build.gradle index 3d0f277d89eb..298c3145eb9d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -366,6 +366,8 @@ dependencies { implementation Deps.autodispose + implementation Deps.lottie + implementation Deps.adjust implementation Deps.installreferrer // Required by Adjust diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt index 1be217f2c00f..ba652ba43b7c 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt @@ -5,9 +5,13 @@ package org.mozilla.fenix.components.toolbar import android.content.Context +import android.graphics.drawable.Animatable +import android.graphics.drawable.Drawable import android.view.ViewGroup import androidx.navigation.NavOptions import androidx.navigation.Navigation +import com.airbnb.lottie.LottieCompositionFactory +import com.airbnb.lottie.LottieDrawable import mozilla.components.browser.domains.autocomplete.DomainAutocompleteProvider import mozilla.components.browser.session.SessionManager import mozilla.components.browser.session.runWithSession @@ -38,6 +42,7 @@ class ToolbarIntegration( ) : LifecycleAwareFeature { private var renderStyle: ToolbarFeature.RenderStyle = ToolbarFeature.RenderStyle.UncoloredUrl + private lateinit var trackingProtectionAction: BrowserToolbar.Button init { toolbar.setMenuBuilder(toolbarMenu.menuBuilder) @@ -52,6 +57,24 @@ class ToolbarIntegration( return@run } + val task = LottieCompositionFactory + .fromRawRes( + context, + ThemeManager.resolveAttribute(R.attr.shieldLottieFile, context) + ) + task.addListener { result -> + val lottieDrawable = LottieDrawable() + lottieDrawable.composition = result + trackingProtectionAction = BrowserToolbar.Button( + (lottieDrawable as? Drawable) + ?: context.getDrawable(R.drawable.ic_tracking_protection)!!, + context.getString(R.string.tracking_protection_on) + ) { + animateTP() + } + toolbar.addBrowserAction(trackingProtectionAction) + } + val tabsAction = TabCounterToolbarButton( sessionManager, { @@ -97,6 +120,12 @@ class ToolbarIntegration( } } + private fun animateTP() { + if (trackingProtectionAction.imageDrawable is Animatable) { + (trackingProtectionAction.imageDrawable as Animatable).start() + } + } + private val toolbarPresenter: ToolbarPresenter = ToolbarPresenter( toolbar, context.components.core.sessionManager, @@ -106,7 +135,8 @@ class ToolbarIntegration( ThemeManager.resolveAttribute(R.attr.primaryText, context), renderStyle = renderStyle ) ) - private var menuPresenter = MenuPresenter(toolbar, context.components.core.sessionManager, sessionId) + private var menuPresenter = + MenuPresenter(toolbar, context.components.core.sessionManager, sessionId) override fun start() { menuPresenter.start() diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsUIView.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsUIView.kt index 9d4c144cda90..3587c3b1003f 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsUIView.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsUIView.kt @@ -46,7 +46,6 @@ class QuickSettingsUIView( private val blockedByAndroidPhoneFeatures = mutableListOf() private inline val context get() = view.context private val settings: Settings = Settings.getInstance(context) - private val trackingProtectionSettingView = TrackingProtectionSettingView(view, actionEmitter) private val labelAndActions = mapOf( CAMERA to findLabelActionPair(R.id.camera_icon, R.id.camera_action_label), LOCATION to findLabelActionPair(R.id.location_icon, R.id.location_action_label), diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/TrackingProtectionSettingView.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/TrackingProtectionSettingView.kt deleted file mode 100644 index 8e25fa27d4c4..000000000000 --- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/TrackingProtectionSettingView.kt +++ /dev/null @@ -1,52 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.settings.quicksettings - -import android.view.View -import android.widget.CompoundButton -import android.widget.Switch -import android.widget.TextView -import androidx.core.view.isVisible -import io.reactivex.Observer -import mozilla.components.support.ktx.android.view.putCompoundDrawablesRelativeWithIntrinsicBounds -import org.mozilla.fenix.R -import org.mozilla.fenix.utils.Settings - -class TrackingProtectionSettingView( - container: View, - private val actionEmitter: Observer -) : View.OnClickListener, CompoundButton.OnCheckedChangeListener { - private val trackingProtectionSwitch: Switch = container.findViewById(R.id.tracking_protection) - private val trackingProtectionAction: TextView = container.findViewById(R.id.tracking_protection_action) - - init { - trackingProtectionSwitch.putCompoundDrawablesRelativeWithIntrinsicBounds( - start = container.context.getDrawable(R.drawable.ic_tracking_protection) - ) - } - - fun bind(isTrackingProtectionOn: Boolean) { - val globalTPSetting = Settings.getInstance(trackingProtectionSwitch.context).shouldUseTrackingProtection - - trackingProtectionAction.isVisible = !globalTPSetting - trackingProtectionAction.setOnClickListener(this) - - trackingProtectionSwitch.isChecked = isTrackingProtectionOn - trackingProtectionSwitch.isEnabled = globalTPSetting - trackingProtectionSwitch.setOnCheckedChangeListener(this) - } - - override fun onClick(view: View) { - actionEmitter.onNext( - QuickSettingsAction.SelectTrackingProtectionSettings - ) - } - - override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) { - actionEmitter.onNext( - QuickSettingsAction.ToggleTrackingProtection(isChecked) - ) - } -} diff --git a/app/src/main/res/raw-night/shield_json.json b/app/src/main/res/raw-night/shield_json.json new file mode 100644 index 000000000000..4ef248090e73 --- /dev/null +++ b/app/src/main/res/raw-night/shield_json.json @@ -0,0 +1,1582 @@ +{ + "v": "5.5.5", + "fr": 30, + "ip": 0, + "op": 17, + "w": 24, + "h": 24, + "nm": "Shield - Final 24x24 (on Dark)", + "ddd": 0, + "assets": [], + "layers": [ + { + "ddd": 0, + "ind": 1, + "ty": 4, + "nm": "Shape Layer 1", + "td": 1, + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 12, + 12, + 0 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 150, + 150, + 100 + ], + "ix": 6 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + -0.938, + -1.062 + ], + [ + -1.312, + 0 + ], + [ + -0.812, + 1.062 + ], + [ + 0, + 0 + ], + [ + 2.188, + 0 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + 0.938, + 1.062 + ], + [ + 1.312, + 0 + ], + [ + 0.812, + -1.062 + ], + [ + 0, + 0 + ], + [ + -2.188, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -4.938, + -3.875 + ], + [ + -4.625, + 1.688 + ], + [ + -0.062, + 5.938 + ], + [ + 4.625, + 1.812 + ], + [ + 5, + -4.375 + ], + [ + 0, + -5.938 + ], + [ + -4.375, + -4.875 + ] + ], + "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 + ], + "y": [ + 1 + ] + }, + "o": { + "x": [ + 0.392 + ], + "y": [ + 0 + ] + }, + "t": 0, + "s": [ + 0 + ] + }, + { + "t": 16, + "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.843137015548, + 0, + 0.133333004222, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 3, + "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": "Shape 1", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 18, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 2, + "ty": 4, + "nm": "Blue Shield", + "tt": 1, + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 12, + 12, + 0 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 6, + 7, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 150, + 150, + 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.971, + 1.298 + ], + [ + 0.042, + 1.905 + ], + [ + 0, + 1.025 + ], + [ + -0.884, + 0.155 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0.003, + -0.899 + ], + [ + 0.08, + -0.839 + ], + [ + 1.13, + -1.536 + ], + [ + 1.602, + -0.257 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + -1.602, + -0.257 + ], + [ + -1.129, + -1.536 + ], + [ + -0.076, + -0.839 + ], + [ + -0.002, + -0.898 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0.885, + 0.154 + ], + [ + 0, + 1.023 + ], + [ + -0.042, + 1.905 + ], + [ + -0.972, + 1.298 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + 0, + 7.006 + ], + [ + -0.112, + 6.994 + ], + [ + -4.124, + 4.568 + ], + [ + -5.924, + -0.719 + ], + [ + -6, + -4.425 + ], + [ + -4.473, + -6.247 + ], + [ + 0, + -7.015 + ], + [ + 4.471, + -6.247 + ], + [ + 6, + -4.424 + ], + [ + 5.92, + -0.719 + ], + [ + 4.12, + 4.568 + ], + [ + 0.108, + 6.994 + ] + ], + "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": [ + [ + 0, + 0 + ], + [ + -0.049, + -0.54 + ], + [ + -0.941, + -1.27 + ], + [ + -1.005, + -0.211 + ], + [ + -0.615, + 0.823 + ], + [ + -0.026, + 1.58 + ], + [ + 0, + 1.625 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 1.625 + ], + [ + 0.026, + 1.58 + ], + [ + 0.615, + 0.823 + ], + [ + 1.005, + -0.211 + ], + [ + 0.941, + -1.27 + ], + [ + 0.049, + -0.54 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -4, + -4.3 + ], + [ + -4, + -1 + ], + [ + -2.513, + 3.382 + ], + [ + 0, + 4.987 + ], + [ + 2.512, + 3.382 + ], + [ + 4, + -1 + ], + [ + 4, + -4.3 + ], + [ + 0, + -4.985 + ] + ], + "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": "gf", + "o": { + "a": 0, + "k": 100, + "ix": 10 + }, + "r": 1, + "bm": 0, + "g": { + "p": 3, + "k": { + "a": 0, + "k": [ + 0, + 0.459, + 0.259, + 0.898, + 0.5, + 0.233, + 0.318, + 0.886, + 1, + 0.008, + 0.376, + 0.875 + ], + "ix": 9 + } + }, + "s": { + "a": 0, + "k": [ + 6.088, + -6.87 + ], + "ix": 5 + }, + "e": { + "a": 0, + "k": [ + -5.96, + 7.121 + ], + "ix": 6 + }, + "t": 1, + "nm": "Gradient Fill 1", + "mn": "ADBE Vector Graphic - G-Fill", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 6, + 7 + ], + "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": 6, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 18, + "st": -10, + "bm": 0 + }, + { + "ddd": 0, + "ind": 3, + "ty": 4, + "nm": "Fill", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 9.75, + 12, + 0 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 1.5, + 4, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 150, + 150, + 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.032, + -0.345 + ], + [ + -0.755, + -1.021 + ], + [ + -0.519, + -0.174 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + 0.009, + 0.942 + ], + [ + -0.022, + 1.269 + ], + [ + 0.327, + 0.439 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + 1.25, + -3.451 + ], + [ + -1.25, + -3.023 + ], + [ + -1.188, + -1.023 + ], + [ + -0.058, + 2.508 + ], + [ + 1.242, + 3.451 + ], + [ + 1.25, + 3.451 + ] + ], + "c": true + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "gf", + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 3, + "s": [ + 0 + ] + }, + { + "t": 13, + "s": [ + 100 + ] + } + ], + "ix": 10 + }, + "r": 1, + "bm": 0, + "g": { + "p": 3, + "k": { + "a": 0, + "k": [ + 0, + 0.459, + 0.259, + 0.898, + 0.5, + 0.233, + 0.318, + 0.886, + 1, + 0.008, + 0.376, + 0.875 + ], + "ix": 9 + } + }, + "s": { + "a": 0, + "k": [ + 7.296, + -6.978 + ], + "ix": 5 + }, + "e": { + "a": 0, + "k": [ + -4.711, + 6.943 + ], + "ix": 6 + }, + "t": 1, + "nm": "Gradient Fill 1", + "mn": "ADBE Vector Graphic - G-Fill", + "hd": false + }, + { + "ty": "fl", + "c": { + "a": 0, + "k": [ + 0.501960813999, + 0.501960813999, + 0.556862771511, + 1 + ], + "ix": 4 + }, + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 100 + ] + }, + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 9, + "s": [ + 99 + ] + }, + { + "t": 14, + "s": [ + 0 + ] + } + ], + "ix": 5 + }, + "r": 1, + "bm": 0, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 1.75, + 3.988 + ], + "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": 18, + "st": -10, + "bm": 0 + }, + { + "ddd": 0, + "ind": 4, + "ty": 4, + "nm": "Grey Shield", + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 13, + "s": [ + 100 + ] + }, + { + "t": 17, + "s": [ + 0 + ] + } + ], + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 12, + 12, + 0 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 6, + 7, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 150, + 150, + 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.971, + 1.298 + ], + [ + 0.042, + 1.905 + ], + [ + 0, + 1.025 + ], + [ + -0.884, + 0.155 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0.003, + -0.899 + ], + [ + 0.08, + -0.839 + ], + [ + 1.13, + -1.536 + ], + [ + 1.602, + -0.257 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + -1.602, + -0.257 + ], + [ + -1.129, + -1.536 + ], + [ + -0.076, + -0.839 + ], + [ + -0.002, + -0.898 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0.885, + 0.154 + ], + [ + 0, + 1.023 + ], + [ + -0.042, + 1.905 + ], + [ + -0.972, + 1.298 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + 0, + 7.006 + ], + [ + -0.112, + 6.994 + ], + [ + -4.124, + 4.568 + ], + [ + -5.924, + -0.719 + ], + [ + -6, + -4.425 + ], + [ + -4.473, + -6.247 + ], + [ + 0, + -7.015 + ], + [ + 4.471, + -6.247 + ], + [ + 6, + -4.424 + ], + [ + 5.92, + -0.719 + ], + [ + 4.12, + 4.568 + ], + [ + 0.108, + 6.994 + ] + ], + "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": [ + [ + 0, + 0 + ], + [ + -0.049, + -0.54 + ], + [ + -0.941, + -1.27 + ], + [ + -1.005, + -0.211 + ], + [ + -0.615, + 0.823 + ], + [ + -0.026, + 1.58 + ], + [ + 0, + 1.625 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 1.625 + ], + [ + 0.026, + 1.58 + ], + [ + 0.615, + 0.823 + ], + [ + 1.005, + -0.211 + ], + [ + 0.941, + -1.27 + ], + [ + 0.049, + -0.54 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -4, + -4.3 + ], + [ + -4, + -1 + ], + [ + -2.513, + 3.382 + ], + [ + 0, + 4.987 + ], + [ + 2.512, + 3.382 + ], + [ + 4, + -1 + ], + [ + 4, + -4.3 + ], + [ + 0, + -4.985 + ] + ], + "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.501960813999, + 0.501960813999, + 0.556862771511, + 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": [ + 6, + 7 + ], + "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": 6, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 18, + "st": -10, + "bm": 0 + } + ], + "markers": [] +} diff --git a/app/src/main/res/raw/shield_json.json b/app/src/main/res/raw/shield_json.json new file mode 100644 index 000000000000..d4173ab3cb03 --- /dev/null +++ b/app/src/main/res/raw/shield_json.json @@ -0,0 +1,1582 @@ +{ + "v": "5.5.5", + "fr": 30, + "ip": 0, + "op": 17, + "w": 24, + "h": 24, + "nm": "Shield - Final for export (updated colours - Amy)", + "ddd": 0, + "assets": [], + "layers": [ + { + "ddd": 0, + "ind": 1, + "ty": 4, + "nm": "Shape Layer 1", + "td": 1, + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 12, + 12, + 0 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 150, + 150, + 100 + ], + "ix": 6 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + -0.938, + -1.062 + ], + [ + -1.312, + 0 + ], + [ + -0.812, + 1.062 + ], + [ + 0, + 0 + ], + [ + 2.188, + 0 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + 0.938, + 1.062 + ], + [ + 1.312, + 0 + ], + [ + 0.812, + -1.062 + ], + [ + 0, + 0 + ], + [ + -2.188, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -4.938, + -3.875 + ], + [ + -4.625, + 1.688 + ], + [ + -0.062, + 5.938 + ], + [ + 4.625, + 1.812 + ], + [ + 5, + -4.375 + ], + [ + 0, + -5.938 + ], + [ + -4.375, + -4.875 + ] + ], + "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 + ], + "y": [ + 1 + ] + }, + "o": { + "x": [ + 0.392 + ], + "y": [ + 0 + ] + }, + "t": 0, + "s": [ + 0 + ] + }, + { + "t": 16, + "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.843137015548, + 0, + 0.133333004222, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 3, + "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": "Shape 1", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 18, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 2, + "ty": 4, + "nm": "Blue Shield", + "tt": 1, + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 12, + 12, + 0 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 6, + 7, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 150, + 150, + 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.971, + 1.298 + ], + [ + 0.042, + 1.905 + ], + [ + 0, + 1.025 + ], + [ + -0.884, + 0.155 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0.003, + -0.899 + ], + [ + 0.08, + -0.839 + ], + [ + 1.13, + -1.536 + ], + [ + 1.602, + -0.257 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + -1.602, + -0.257 + ], + [ + -1.129, + -1.536 + ], + [ + -0.076, + -0.839 + ], + [ + -0.002, + -0.898 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0.885, + 0.154 + ], + [ + 0, + 1.023 + ], + [ + -0.042, + 1.905 + ], + [ + -0.972, + 1.298 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + 0, + 7.006 + ], + [ + -0.112, + 6.994 + ], + [ + -4.124, + 4.568 + ], + [ + -5.924, + -0.719 + ], + [ + -6, + -4.425 + ], + [ + -4.473, + -6.247 + ], + [ + 0, + -7.015 + ], + [ + 4.471, + -6.247 + ], + [ + 6, + -4.424 + ], + [ + 5.92, + -0.719 + ], + [ + 4.12, + 4.568 + ], + [ + 0.108, + 6.994 + ] + ], + "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": [ + [ + 0, + 0 + ], + [ + -0.049, + -0.54 + ], + [ + -0.941, + -1.27 + ], + [ + -1.005, + -0.211 + ], + [ + -0.615, + 0.823 + ], + [ + -0.026, + 1.58 + ], + [ + 0, + 1.625 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 1.625 + ], + [ + 0.026, + 1.58 + ], + [ + 0.615, + 0.823 + ], + [ + 1.005, + -0.211 + ], + [ + 0.941, + -1.27 + ], + [ + 0.049, + -0.54 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -4, + -4.3 + ], + [ + -4, + -1 + ], + [ + -2.513, + 3.382 + ], + [ + 0, + 4.987 + ], + [ + 2.512, + 3.382 + ], + [ + 4, + -1 + ], + [ + 4, + -4.3 + ], + [ + 0, + -4.985 + ] + ], + "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": "gf", + "o": { + "a": 0, + "k": 100, + "ix": 10 + }, + "r": 1, + "bm": 0, + "g": { + "p": 3, + "k": { + "a": 0, + "k": [ + 0, + 0.565, + 0.349, + 1, + 0.5, + 0.286, + 0.331, + 0.867, + 1, + 0.008, + 0.314, + 0.733 + ], + "ix": 9 + } + }, + "s": { + "a": 0, + "k": [ + 6.088, + -6.87 + ], + "ix": 5 + }, + "e": { + "a": 0, + "k": [ + -5.96, + 7.121 + ], + "ix": 6 + }, + "t": 1, + "nm": "Gradient Fill 1", + "mn": "ADBE Vector Graphic - G-Fill", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 6, + 7 + ], + "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": 6, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 18, + "st": -10, + "bm": 0 + }, + { + "ddd": 0, + "ind": 3, + "ty": 4, + "nm": "Fill", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 9.75, + 12, + 0 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 1.5, + 4, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 150, + 150, + 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.032, + -0.345 + ], + [ + -0.755, + -1.021 + ], + [ + -0.519, + -0.174 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + 0.009, + 0.942 + ], + [ + -0.022, + 1.269 + ], + [ + 0.327, + 0.439 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + 1.25, + -3.451 + ], + [ + -1.25, + -3.023 + ], + [ + -1.188, + -1.023 + ], + [ + -0.058, + 2.508 + ], + [ + 1.242, + 3.451 + ], + [ + 1.25, + 3.451 + ] + ], + "c": true + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "gf", + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 3, + "s": [ + 0 + ] + }, + { + "t": 13, + "s": [ + 100 + ] + } + ], + "ix": 10 + }, + "r": 1, + "bm": 0, + "g": { + "p": 3, + "k": { + "a": 0, + "k": [ + 0, + 0.565, + 0.349, + 1, + 0.5, + 0.286, + 0.331, + 0.867, + 1, + 0.008, + 0.314, + 0.733 + ], + "ix": 9 + } + }, + "s": { + "a": 0, + "k": [ + 7.296, + -6.978 + ], + "ix": 5 + }, + "e": { + "a": 0, + "k": [ + -4.711, + 6.943 + ], + "ix": 6 + }, + "t": 1, + "nm": "Gradient Fill 1", + "mn": "ADBE Vector Graphic - G-Fill", + "hd": false + }, + { + "ty": "fl", + "c": { + "a": 0, + "k": [ + 0.501960813999, + 0.501960813999, + 0.556862771511, + 1 + ], + "ix": 4 + }, + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 100 + ] + }, + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 9, + "s": [ + 99 + ] + }, + { + "t": 14, + "s": [ + 0 + ] + } + ], + "ix": 5 + }, + "r": 1, + "bm": 0, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 1.75, + 3.988 + ], + "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": 18, + "st": -10, + "bm": 0 + }, + { + "ddd": 0, + "ind": 4, + "ty": 4, + "nm": "Grey Shield", + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 13, + "s": [ + 100 + ] + }, + { + "t": 17, + "s": [ + 0 + ] + } + ], + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 12, + 12, + 0 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 6, + 7, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 150, + 150, + 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.971, + 1.298 + ], + [ + 0.042, + 1.905 + ], + [ + 0, + 1.025 + ], + [ + -0.884, + 0.155 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0.003, + -0.899 + ], + [ + 0.08, + -0.839 + ], + [ + 1.13, + -1.536 + ], + [ + 1.602, + -0.257 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + -1.602, + -0.257 + ], + [ + -1.129, + -1.536 + ], + [ + -0.076, + -0.839 + ], + [ + -0.002, + -0.898 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0.885, + 0.154 + ], + [ + 0, + 1.023 + ], + [ + -0.042, + 1.905 + ], + [ + -0.972, + 1.298 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + 0, + 7.006 + ], + [ + -0.112, + 6.994 + ], + [ + -4.124, + 4.568 + ], + [ + -5.924, + -0.719 + ], + [ + -6, + -4.425 + ], + [ + -4.473, + -6.247 + ], + [ + 0, + -7.015 + ], + [ + 4.471, + -6.247 + ], + [ + 6, + -4.424 + ], + [ + 5.92, + -0.719 + ], + [ + 4.12, + 4.568 + ], + [ + 0.108, + 6.994 + ] + ], + "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": [ + [ + 0, + 0 + ], + [ + -0.049, + -0.54 + ], + [ + -0.941, + -1.27 + ], + [ + -1.005, + -0.211 + ], + [ + -0.615, + 0.823 + ], + [ + -0.026, + 1.58 + ], + [ + 0, + 1.625 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 1.625 + ], + [ + 0.026, + 1.58 + ], + [ + 0.615, + 0.823 + ], + [ + 1.005, + -0.211 + ], + [ + 0.941, + -1.27 + ], + [ + 0.049, + -0.54 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -4, + -4.3 + ], + [ + -4, + -1 + ], + [ + -2.513, + 3.382 + ], + [ + 0, + 4.987 + ], + [ + 2.512, + 3.382 + ], + [ + 4, + -1 + ], + [ + 4, + -4.3 + ], + [ + 0, + -4.985 + ] + ], + "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.501960813999, + 0.501960813999, + 0.556862771511, + 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": [ + 6, + 7 + ], + "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": 6, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 18, + "st": -10, + "bm": 0 + } + ], + "markers": [] +} \ No newline at end of file diff --git a/app/src/main/res/raw/shield_json_dark.json b/app/src/main/res/raw/shield_json_dark.json new file mode 100644 index 000000000000..4ef248090e73 --- /dev/null +++ b/app/src/main/res/raw/shield_json_dark.json @@ -0,0 +1,1582 @@ +{ + "v": "5.5.5", + "fr": 30, + "ip": 0, + "op": 17, + "w": 24, + "h": 24, + "nm": "Shield - Final 24x24 (on Dark)", + "ddd": 0, + "assets": [], + "layers": [ + { + "ddd": 0, + "ind": 1, + "ty": 4, + "nm": "Shape Layer 1", + "td": 1, + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 12, + 12, + 0 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 150, + 150, + 100 + ], + "ix": 6 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + -0.938, + -1.062 + ], + [ + -1.312, + 0 + ], + [ + -0.812, + 1.062 + ], + [ + 0, + 0 + ], + [ + 2.188, + 0 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + 0.938, + 1.062 + ], + [ + 1.312, + 0 + ], + [ + 0.812, + -1.062 + ], + [ + 0, + 0 + ], + [ + -2.188, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -4.938, + -3.875 + ], + [ + -4.625, + 1.688 + ], + [ + -0.062, + 5.938 + ], + [ + 4.625, + 1.812 + ], + [ + 5, + -4.375 + ], + [ + 0, + -5.938 + ], + [ + -4.375, + -4.875 + ] + ], + "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 + ], + "y": [ + 1 + ] + }, + "o": { + "x": [ + 0.392 + ], + "y": [ + 0 + ] + }, + "t": 0, + "s": [ + 0 + ] + }, + { + "t": 16, + "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.843137015548, + 0, + 0.133333004222, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 3, + "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": "Shape 1", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 18, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 2, + "ty": 4, + "nm": "Blue Shield", + "tt": 1, + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 12, + 12, + 0 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 6, + 7, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 150, + 150, + 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.971, + 1.298 + ], + [ + 0.042, + 1.905 + ], + [ + 0, + 1.025 + ], + [ + -0.884, + 0.155 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0.003, + -0.899 + ], + [ + 0.08, + -0.839 + ], + [ + 1.13, + -1.536 + ], + [ + 1.602, + -0.257 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + -1.602, + -0.257 + ], + [ + -1.129, + -1.536 + ], + [ + -0.076, + -0.839 + ], + [ + -0.002, + -0.898 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0.885, + 0.154 + ], + [ + 0, + 1.023 + ], + [ + -0.042, + 1.905 + ], + [ + -0.972, + 1.298 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + 0, + 7.006 + ], + [ + -0.112, + 6.994 + ], + [ + -4.124, + 4.568 + ], + [ + -5.924, + -0.719 + ], + [ + -6, + -4.425 + ], + [ + -4.473, + -6.247 + ], + [ + 0, + -7.015 + ], + [ + 4.471, + -6.247 + ], + [ + 6, + -4.424 + ], + [ + 5.92, + -0.719 + ], + [ + 4.12, + 4.568 + ], + [ + 0.108, + 6.994 + ] + ], + "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": [ + [ + 0, + 0 + ], + [ + -0.049, + -0.54 + ], + [ + -0.941, + -1.27 + ], + [ + -1.005, + -0.211 + ], + [ + -0.615, + 0.823 + ], + [ + -0.026, + 1.58 + ], + [ + 0, + 1.625 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 1.625 + ], + [ + 0.026, + 1.58 + ], + [ + 0.615, + 0.823 + ], + [ + 1.005, + -0.211 + ], + [ + 0.941, + -1.27 + ], + [ + 0.049, + -0.54 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -4, + -4.3 + ], + [ + -4, + -1 + ], + [ + -2.513, + 3.382 + ], + [ + 0, + 4.987 + ], + [ + 2.512, + 3.382 + ], + [ + 4, + -1 + ], + [ + 4, + -4.3 + ], + [ + 0, + -4.985 + ] + ], + "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": "gf", + "o": { + "a": 0, + "k": 100, + "ix": 10 + }, + "r": 1, + "bm": 0, + "g": { + "p": 3, + "k": { + "a": 0, + "k": [ + 0, + 0.459, + 0.259, + 0.898, + 0.5, + 0.233, + 0.318, + 0.886, + 1, + 0.008, + 0.376, + 0.875 + ], + "ix": 9 + } + }, + "s": { + "a": 0, + "k": [ + 6.088, + -6.87 + ], + "ix": 5 + }, + "e": { + "a": 0, + "k": [ + -5.96, + 7.121 + ], + "ix": 6 + }, + "t": 1, + "nm": "Gradient Fill 1", + "mn": "ADBE Vector Graphic - G-Fill", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 6, + 7 + ], + "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": 6, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 18, + "st": -10, + "bm": 0 + }, + { + "ddd": 0, + "ind": 3, + "ty": 4, + "nm": "Fill", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 9.75, + 12, + 0 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 1.5, + 4, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 150, + 150, + 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.032, + -0.345 + ], + [ + -0.755, + -1.021 + ], + [ + -0.519, + -0.174 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + 0.009, + 0.942 + ], + [ + -0.022, + 1.269 + ], + [ + 0.327, + 0.439 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + 1.25, + -3.451 + ], + [ + -1.25, + -3.023 + ], + [ + -1.188, + -1.023 + ], + [ + -0.058, + 2.508 + ], + [ + 1.242, + 3.451 + ], + [ + 1.25, + 3.451 + ] + ], + "c": true + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "gf", + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 3, + "s": [ + 0 + ] + }, + { + "t": 13, + "s": [ + 100 + ] + } + ], + "ix": 10 + }, + "r": 1, + "bm": 0, + "g": { + "p": 3, + "k": { + "a": 0, + "k": [ + 0, + 0.459, + 0.259, + 0.898, + 0.5, + 0.233, + 0.318, + 0.886, + 1, + 0.008, + 0.376, + 0.875 + ], + "ix": 9 + } + }, + "s": { + "a": 0, + "k": [ + 7.296, + -6.978 + ], + "ix": 5 + }, + "e": { + "a": 0, + "k": [ + -4.711, + 6.943 + ], + "ix": 6 + }, + "t": 1, + "nm": "Gradient Fill 1", + "mn": "ADBE Vector Graphic - G-Fill", + "hd": false + }, + { + "ty": "fl", + "c": { + "a": 0, + "k": [ + 0.501960813999, + 0.501960813999, + 0.556862771511, + 1 + ], + "ix": 4 + }, + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 100 + ] + }, + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 9, + "s": [ + 99 + ] + }, + { + "t": 14, + "s": [ + 0 + ] + } + ], + "ix": 5 + }, + "r": 1, + "bm": 0, + "nm": "Fill 1", + "mn": "ADBE Vector Graphic - Fill", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 1.75, + 3.988 + ], + "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": 18, + "st": -10, + "bm": 0 + }, + { + "ddd": 0, + "ind": 4, + "ty": 4, + "nm": "Grey Shield", + "sr": 1, + "ks": { + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 13, + "s": [ + 100 + ] + }, + { + "t": 17, + "s": [ + 0 + ] + } + ], + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 12, + 12, + 0 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 6, + 7, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 150, + 150, + 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.971, + 1.298 + ], + [ + 0.042, + 1.905 + ], + [ + 0, + 1.025 + ], + [ + -0.884, + 0.155 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0.003, + -0.899 + ], + [ + 0.08, + -0.839 + ], + [ + 1.13, + -1.536 + ], + [ + 1.602, + -0.257 + ] + ], + "o": [ + [ + 0, + 0 + ], + [ + -1.602, + -0.257 + ], + [ + -1.129, + -1.536 + ], + [ + -0.076, + -0.839 + ], + [ + -0.002, + -0.898 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + 0.885, + 0.154 + ], + [ + 0, + 1.023 + ], + [ + -0.042, + 1.905 + ], + [ + -0.972, + 1.298 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + 0, + 7.006 + ], + [ + -0.112, + 6.994 + ], + [ + -4.124, + 4.568 + ], + [ + -5.924, + -0.719 + ], + [ + -6, + -4.425 + ], + [ + -4.473, + -6.247 + ], + [ + 0, + -7.015 + ], + [ + 4.471, + -6.247 + ], + [ + 6, + -4.424 + ], + [ + 5.92, + -0.719 + ], + [ + 4.12, + 4.568 + ], + [ + 0.108, + 6.994 + ] + ], + "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": [ + [ + 0, + 0 + ], + [ + -0.049, + -0.54 + ], + [ + -0.941, + -1.27 + ], + [ + -1.005, + -0.211 + ], + [ + -0.615, + 0.823 + ], + [ + -0.026, + 1.58 + ], + [ + 0, + 1.625 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + 0, + 1.625 + ], + [ + 0.026, + 1.58 + ], + [ + 0.615, + 0.823 + ], + [ + 1.005, + -0.211 + ], + [ + 0.941, + -1.27 + ], + [ + 0.049, + -0.54 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -4, + -4.3 + ], + [ + -4, + -1 + ], + [ + -2.513, + 3.382 + ], + [ + 0, + 4.987 + ], + [ + 2.512, + 3.382 + ], + [ + 4, + -1 + ], + [ + 4, + -4.3 + ], + [ + 0, + -4.985 + ] + ], + "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.501960813999, + 0.501960813999, + 0.556862771511, + 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": [ + 6, + 7 + ], + "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": 6, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 18, + "st": -10, + "bm": 0 + } + ], + "markers": [] +} diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 08ae7740de0c..fce301f78a0e 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -33,6 +33,7 @@ + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 775ec64001df..989a60593f8e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -54,6 +54,7 @@ @color/foundation_normal_theme @android:color/transparent @color/primary_text_normal_theme + @raw/shield_json diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 5fd558954a94..e8278f0a169f 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -62,6 +62,8 @@ object Versions { const val robolectric = "4.2" const val google_ads_id_version = "16.0.0" + + const val airbnb_lottie = "3.0.1" } @Suppress("unused") @@ -203,4 +205,6 @@ object Deps { const val places_forUnitTests = "org.mozilla.appservices:places-forUnitTests:${Versions.mozilla_appservices}" const val google_ads_id = "com.google.android.gms:play-services-ads-identifier:${Versions.google_ads_id_version}" + + const val lottie = "com.airbnb.android:lottie:${Versions.airbnb_lottie}" }