mirror of
https://github.com/ironfox-oss/IronFox.git
synced 2026-04-19 22:47:39 -04:00
fix: Update onboarding to remove Terms of Use/privacy policy, + replace Firefox logo with ours and add other minor adjustments/fixes
Signed-off-by: celenity <celenity@celenity.dev>
This commit is contained in:
@@ -27,6 +27,33 @@ index 9bf4bb29a4..958bed6d9b 100644
|
||||
|
||||
|
||||
set_config(
|
||||
diff --git a/mobile/android/fenix/app/build.gradle b/mobile/android/fenix/app/build.gradle
|
||||
index 7535453460..51260d1abe 100644
|
||||
--- a/mobile/android/fenix/app/build.gradle
|
||||
+++ b/mobile/android/fenix/app/build.gradle
|
||||
@@ -68,20 +68,11 @@ android {
|
||||
buildConfigField "String", "VCS_HASH", "\"\"" // see override in release builds for why it's blank.
|
||||
// This should be the "public" base URL of AMO.
|
||||
buildConfigField "String", "AMO_BASE_URL", "\"https://addons.mozilla.org\""
|
||||
- buildConfigField "String", "AMO_COLLECTION_NAME", "\"Extensions-for-Android\""
|
||||
- buildConfigField "String", "AMO_COLLECTION_USER", "\"mozilla\""
|
||||
+ buildConfigField "String", "AMO_COLLECTION_NAME", "\"IronFox\""
|
||||
+ buildConfigField "String", "AMO_COLLECTION_USER", "\"18588170\""
|
||||
// These add-ons should be excluded for Mozilla Online builds.
|
||||
buildConfigField "String[]", "MOZILLA_ONLINE_ADDON_EXCLUSIONS",
|
||||
"{" +
|
||||
- "\"uBlock0@raymondhill.net\"," +
|
||||
- "\"firefox@ghostery.com\"," +
|
||||
- "\"jid1-MnnxcxisBPnSXQ@jetpack\"," +
|
||||
- "\"adguardadblocker@adguard.com\"," +
|
||||
- "\"foxyproxy@eric.h.jung\"," +
|
||||
- "\"{73a6fe31-595d-460b-a920-fcc0f8843232}\"," +
|
||||
- "\"jid1-BoFifL9Vbdl2zQ@jetpack\"," +
|
||||
- "\"woop-NoopscooPsnSXQ@jetpack\"," +
|
||||
- "\"adnauseam@rednoise.org\"" +
|
||||
"}"
|
||||
// This should be the base URL used to call the AMO API.
|
||||
buildConfigField "String", "AMO_SERVER_URL", "\"https://services.addons.mozilla.org\""
|
||||
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
|
||||
index 598a24ce36..8e072075a5 100644
|
||||
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
|
||||
@@ -53,6 +80,396 @@ index c900501ee6..8b3e4a434c 100644
|
||||
imply_option("MOZ_APP_ID", "{aa3c5121-dab2-40e2-81ca-7ea25febc110}")
|
||||
imply_option("BROWSER_CHROME_URL", "chrome://geckoview/content/geckoview.xhtml")
|
||||
|
||||
--
|
||||
2.49.0
|
||||
|
||||
diff --git a/mobile/android/fenix/app/src/main/res/values/strings.xml b/mobile/android/fenix/app/src/main/res/values/strings.xml
|
||||
index 42f7a055de..885a7e0abf 100644
|
||||
--- a/mobile/android/fenix/app/src/main/res/values/strings.xml
|
||||
+++ b/mobile/android/fenix/app/src/main/res/values/strings.xml
|
||||
@@ -468,10 +468,10 @@
|
||||
<string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Not now</string>
|
||||
<!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
|
||||
Note: The word "Firefox" should NOT be translated -->
|
||||
- <string name="juno_onboarding_enable_notifications_title_nimbus_2" tools:ignore="BrandUsage">Notifications help you stay safer with Firefox</string>
|
||||
+ <string name="juno_onboarding_enable_notifications_title_nimbus_2" tools:ignore="BrandUsage">Enable notifications</string>
|
||||
<!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
|
||||
Note: The word "Firefox" should NOT be translated -->
|
||||
- <string name="juno_onboarding_enable_notifications_description_nimbus_2" tools:ignore="BrandUsage">Securely send tabs between your devices and discover other privacy features in Firefox.</string>
|
||||
+ <string name="juno_onboarding_enable_notifications_description_nimbus_2" tools:ignore="BrandUsage">IronFox can remind you when private tabs are open and show you the progress of file downloads.</string>
|
||||
<!-- Text for the button to request notification permission on the device -->
|
||||
<string name="juno_onboarding_enable_notifications_positive_button" tools:ignore="UnusedResources">Turn on notifications</string>
|
||||
<!-- Text for the button dismiss the screen and move on with the flow -->
|
||||
@@ -549,9 +549,9 @@
|
||||
<!-- Terms of service sub header label. -->
|
||||
<string name="onboarding_terms_of_service_sub_header" tools:ignore="UnusedResources" moz:removedIn="136">Fast and secure web browsing.</string>
|
||||
<!-- Terms of service sub header label. -->
|
||||
- <string name="onboarding_terms_of_service_sub_header_2">Fast and secure web browsing</string>
|
||||
+ <string name="onboarding_terms_of_service_sub_header_2">The private and secure Firefox-based web browser for Android.</string>
|
||||
<!-- Terms of service onboarding page continue button label. -->
|
||||
- <string name="onboarding_term_of_service_agree_and_continue_button_label">Agree and continue</string>
|
||||
+ <string name="onboarding_term_of_service_agree_and_continue_button_label">Continue</string>
|
||||
<!-- Line one of the terms of service onboarding page. %1$s is replaced by an active link, using onboarding_term_of_service_line_one_link_text_2 as text (“Firefox Terms of Use”). -->
|
||||
<string name="onboarding_term_of_service_line_one" moz:removedIn="136" tools:ignore="BrandUsage, UnusedResources">By continuing, you agree to the Firefox %1$s.</string>
|
||||
<!-- Line one of the terms of service onboarding page. %1$s is replaced by an active link, using onboarding_term_of_service_line_one_link_text_2 as text (“Firefox Terms of Use”). -->
|
||||
diff --git a/mobile/android/fenix/app/src/main/res/values-en-rCA/strings.xml b/mobile/android/fenix/app/src/main/res/values-en-rCA/strings.xml
|
||||
index 9d95cd32a5..61cb667cd6 100644
|
||||
--- a/mobile/android/fenix/app/src/main/res/values-en-rCA/strings.xml
|
||||
+++ b/mobile/android/fenix/app/src/main/res/values-en-rCA/strings.xml
|
||||
@@ -544,12 +544,12 @@
|
||||
Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
|
||||
Note: The word "Firefox" should NOT be translated
|
||||
-->
|
||||
- <string name="juno_onboarding_enable_notifications_title_nimbus_2" tools:ignore="BrandUsage">Notifications help you stay safer with Firefox</string>
|
||||
+ <string name="juno_onboarding_enable_notifications_title_nimbus_2" tools:ignore="BrandUsage">Enable notifications</string>
|
||||
<!--
|
||||
Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
|
||||
Note: The word "Firefox" should NOT be translated
|
||||
-->
|
||||
- <string name="juno_onboarding_enable_notifications_description_nimbus_2" tools:ignore="BrandUsage">Securely send tabs between your devices and discover other privacy features in Firefox.</string>
|
||||
+ <string name="juno_onboarding_enable_notifications_description_nimbus_2" tools:ignore="BrandUsage">IronFox can remind you when private tabs are open and show you the progress of file downloads.</string>
|
||||
<!-- Text for the button to request notification permission on the device -->
|
||||
<string name="juno_onboarding_enable_notifications_positive_button" tools:ignore="UnusedResources">Turn on notifications</string>
|
||||
<!-- Text for the button dismiss the screen and move on with the flow -->
|
||||
@@ -627,9 +627,9 @@
|
||||
<!-- Terms of service onboarding title card label. 'Firefox' intentionally hardcoded here -->
|
||||
<string name="onboarding_welcome_to_firefox" tools:ignore="BrandUsage">Welcome to Firefox</string>
|
||||
<!-- Terms of service sub header label. -->
|
||||
- <string name="onboarding_terms_of_service_sub_header_2">Fast and secure web browsing</string>
|
||||
+ <string name="onboarding_terms_of_service_sub_header_2">The private and secure Firefox-based web browser for Android.</string>
|
||||
<!-- Terms of service onboarding page continue button label. -->
|
||||
- <string name="onboarding_term_of_service_agree_and_continue_button_label">Agree and continue</string>
|
||||
+ <string name="onboarding_term_of_service_agree_and_continue_button_label">Continue</string>
|
||||
<!-- Line one of the terms of service onboarding page. %1$s is replaced by an active link, using onboarding_term_of_service_line_one_link_text_2 as text (“Firefox Terms of Use”). -->
|
||||
<string name="onboarding_term_of_service_line_one_2">By continuing, you agree to the %1$s.</string>
|
||||
<!-- Used as text for the link in onboarding_term_of_service_line_one_2. -->
|
||||
diff --git a/mobile/android/fenix/app/src/main/res/values-en-rGB/strings.xml b/mobile/android/fenix/app/src/main/res/values-en-rGB/strings.xml
|
||||
index f60598d397..b497dfdd8b 100644
|
||||
--- a/mobile/android/fenix/app/src/main/res/values-en-rGB/strings.xml
|
||||
+++ b/mobile/android/fenix/app/src/main/res/values-en-rGB/strings.xml
|
||||
@@ -546,12 +546,12 @@
|
||||
Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
|
||||
Note: The word "Firefox" should NOT be translated
|
||||
-->
|
||||
- <string name="juno_onboarding_enable_notifications_title_nimbus_2" tools:ignore="BrandUsage">Notifications help you stay safer with Firefox</string>
|
||||
+ <string name="juno_onboarding_enable_notifications_title_nimbus_2" tools:ignore="BrandUsage">Enable notifications</string>
|
||||
<!--
|
||||
Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
|
||||
Note: The word "Firefox" should NOT be translated
|
||||
-->
|
||||
- <string name="juno_onboarding_enable_notifications_description_nimbus_2" tools:ignore="BrandUsage">Securely send tabs between your devices and discover other privacy features in Firefox.</string>
|
||||
+ <string name="juno_onboarding_enable_notifications_description_nimbus_2" tools:ignore="BrandUsage">IronFox can remind you when private tabs are open and show you the progress of file downloads.</string>
|
||||
<!-- Text for the button to request notification permission on the device -->
|
||||
<string name="juno_onboarding_enable_notifications_positive_button" tools:ignore="UnusedResources">Turn on notifications</string>
|
||||
<!-- Text for the button dismiss the screen and move on with the flow -->
|
||||
@@ -629,9 +629,9 @@
|
||||
<!-- Terms of service onboarding title card label. 'Firefox' intentionally hardcoded here -->
|
||||
<string name="onboarding_welcome_to_firefox" tools:ignore="BrandUsage">Welcome to Firefox</string>
|
||||
<!-- Terms of service sub header label. -->
|
||||
- <string name="onboarding_terms_of_service_sub_header_2">Fast and secure web browsing</string>
|
||||
+ <string name="onboarding_terms_of_service_sub_header_2">The private and secure Firefox-based web browser for Android.</string>
|
||||
<!-- Terms of service onboarding page continue button label. -->
|
||||
- <string name="onboarding_term_of_service_agree_and_continue_button_label">Agree and continue</string>
|
||||
+ <string name="onboarding_term_of_service_agree_and_continue_button_label">Continue</string>
|
||||
<!-- Line one of the terms of service onboarding page. %1$s is replaced by an active link, using onboarding_term_of_service_line_one_link_text_2 as text (“Firefox Terms of Use”). -->
|
||||
<string name="onboarding_term_of_service_line_one_2">By continuing, you agree to the %1$s.</string>
|
||||
<!-- Used as text for the link in onboarding_term_of_service_line_one_2. -->
|
||||
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt
|
||||
index 1c975c33f4..69e289f968 100644
|
||||
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt
|
||||
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingFragment.kt
|
||||
@@ -80,7 +80,7 @@ class OnboardingFragment : Fragment() {
|
||||
pagesToDisplay(
|
||||
showDefaultBrowserPage = isNotDefaultBrowser(this) && !isDefaultBrowserPromptSupported(),
|
||||
showNotificationPage = canShowNotificationPage(),
|
||||
- showAddWidgetPage = canShowAddSearchWidgetPrompt(),
|
||||
+ showAddWidgetPage = false,
|
||||
).toMutableList()
|
||||
}
|
||||
}
|
||||
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingMapper.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingMapper.kt
|
||||
index 1c717bf900..f33154cc20 100644
|
||||
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingMapper.kt
|
||||
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingMapper.kt
|
||||
@@ -34,7 +34,7 @@ internal fun Collection<OnboardingCardData>.toPageUiData(
|
||||
.mapIndexed {
|
||||
index, onboardingCardData ->
|
||||
// only first onboarding card shows privacy caption
|
||||
- onboardingCardData.toPageUiData(if (index == 0) privacyCaption else null)
|
||||
+ onboardingCardData.toPageUiData(null)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -114,7 +114,6 @@ private fun OnboardingCardData.toPageUiData(privacyCaption: Caption?) = Onboardi
|
||||
themeOptions = extraData?.customizationThemeData
|
||||
?.takeIf { it.isNotEmpty() }
|
||||
?.toOnboardingThemeOptions(),
|
||||
- termsOfService = extraData?.termOfServiceData?.toOnboardingTermsOfService(),
|
||||
marketingData = extraData?.marketingData?.toOnboardingMarketingData(),
|
||||
)
|
||||
|
||||
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/TermsOfServiceOnboardingPage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/TermsOfServiceOnboardingPage.kt
|
||||
index d6f204609e..82a8130761 100644
|
||||
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/TermsOfServiceOnboardingPage.kt
|
||||
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/TermsOfServiceOnboardingPage.kt
|
||||
@@ -134,22 +134,22 @@ private fun BodyText(
|
||||
modifier = Modifier.padding(horizontal = 10.dp),
|
||||
) {
|
||||
val lineOneState = LinkTextState(
|
||||
- text = it.lineOneLinkText,
|
||||
- url = it.lineOneLinkUrl,
|
||||
- onClick = eventHandler::onTermsOfServiceLinkClicked,
|
||||
+ text = "",
|
||||
+ url = "",
|
||||
+ onClick = {},
|
||||
)
|
||||
val lineTwoState = LinkTextState(
|
||||
- text = it.lineTwoLinkText,
|
||||
- url = it.lineTwoLinkUrl,
|
||||
- onClick = eventHandler::onPrivacyNoticeLinkClicked,
|
||||
+ text = "",
|
||||
+ url = "",
|
||||
+ onClick = {},
|
||||
)
|
||||
val lineThreeState = LinkTextState(
|
||||
- text = it.lineThreeLinkText,
|
||||
+ text = "",
|
||||
url = "",
|
||||
- onClick = { _ -> eventHandler.onManagePrivacyPreferencesLinkClicked() },
|
||||
+ onClick = {},
|
||||
)
|
||||
LinkText(
|
||||
- text = it.lineOneText.updateFirstPlaceholder(it.lineOneLinkText),
|
||||
+ text = "",
|
||||
linkTextStates = listOf(
|
||||
lineOneState,
|
||||
),
|
||||
@@ -161,7 +161,7 @@ private fun BodyText(
|
||||
)
|
||||
|
||||
LinkText(
|
||||
- text = it.lineTwoText.updateFirstPlaceholder(it.lineTwoLinkText),
|
||||
+ text = "",
|
||||
linkTextStates = listOf(
|
||||
lineTwoState,
|
||||
),
|
||||
@@ -173,7 +173,7 @@ private fun BodyText(
|
||||
)
|
||||
|
||||
LinkText(
|
||||
- text = it.lineThreeText.updateFirstPlaceholder(it.lineThreeLinkText),
|
||||
+ text = "",
|
||||
linkTextStates = listOf(
|
||||
lineThreeState,
|
||||
),
|
||||
@@ -200,14 +200,14 @@ private fun OnboardingPagePreview() {
|
||||
title = stringResource(id = R.string.onboarding_welcome_to_firefox),
|
||||
description = stringResource(id = R.string.onboarding_terms_of_service_sub_header_2),
|
||||
termsOfService = OnboardingTermsOfService(
|
||||
- lineOneText = stringResource(id = R.string.onboarding_term_of_service_line_one_2),
|
||||
- lineOneLinkText = stringResource(id = R.string.onboarding_term_of_service_line_one_link_text_2),
|
||||
- lineOneLinkUrl = "URL",
|
||||
- lineTwoText = stringResource(id = R.string.onboarding_term_of_service_line_two_2),
|
||||
- lineTwoLinkText = stringResource(id = R.string.onboarding_term_of_service_line_two_link_text),
|
||||
- lineTwoLinkUrl = "URL",
|
||||
- lineThreeText = stringResource(id = R.string.onboarding_term_of_service_line_three),
|
||||
- lineThreeLinkText = stringResource(id = R.string.onboarding_term_of_service_line_three_link_text),
|
||||
+ lineOneText = "",
|
||||
+ lineOneLinkText = "",
|
||||
+ lineOneLinkUrl = "",
|
||||
+ lineTwoText = "",
|
||||
+ lineTwoLinkText = "",
|
||||
+ lineTwoLinkUrl = "",
|
||||
+ lineThreeText = "",
|
||||
+ lineThreeLinkText = "",
|
||||
),
|
||||
imageRes = R.drawable.ic_firefox,
|
||||
primaryButton = Action(
|
||||
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
|
||||
index 8e271198b0..f0aba2a6dc 100644
|
||||
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
|
||||
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
|
||||
@@ -2492,8 +2492,5 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
||||
/**
|
||||
* Indicates if the user has completed the setup step for exploring extensions
|
||||
*/
|
||||
- var hasCompletedSetupStepExtensions by booleanPreference(
|
||||
- key = appContext.getPreferenceKey(R.string.pref_key_setup_step_extensions),
|
||||
- default = false,
|
||||
- )
|
||||
+ var hasCompletedSetupStepExtensions = true
|
||||
}
|
||||
diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_firefox.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_firefox.xml
|
||||
index 8e369db27c..b1e6090f14 100644
|
||||
--- a/mobile/android/fenix/app/src/main/res/drawable/ic_firefox.xml
|
||||
+++ b/mobile/android/fenix/app/src/main/res/drawable/ic_firefox.xml
|
||||
@@ -1,141 +1,32 @@
|
||||
-<!-- 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/. -->
|
||||
-
|
||||
-<vector android:height="112.7dp" android:viewportHeight="54.28"
|
||||
- android:viewportWidth="52.03" android:width="108.02839dp"
|
||||
- xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
- <path android:pathData="M50.15,18.05c-1.13,-2.72 -3.43,-5.66 -5.23,-6.59a26.79,26.79 0,0 1,2.64 7.91c-3,-7.34 -7.94,-10.3 -12,-16.74 -0.2,-0.33 -0.41,-0.65 -0.61,-1a5.94,5.94 0,0 1,-0.29 -0.54,4.92 4.92,0 0,1 -0.39,-1 0.07,0.07 0,0 0,-0.05 -0.07h-0.07a19,19 0,0 0,-9 14.46A12.92,12.92 0,0 0,18.02 17.26a10.031,10.031 0,0 0,-0.68 -0.51,12 12,0 0,1 -0.07,-6.36A19.21,19.21 0,0 0,11.02 15.23c-1,-1.31 -1,-5.62 -0.9,-6.52a4.39,4.39 0,0 0,-0.87 0.46,19.37 19.37,0 0,0 -2.54,2.18 22.23,22.23 0,0 0,-2.43 2.92,21.88 21.88,0 0,0 -3.5,7.88v0.18a39.159,39.159 0,0 0,-0.26 1.62,0.13 0.13,0 0,1 0,0.06 26.47,26.47 0,0 0,-0.5 3.59L0.02,27.77a26,26 0,0 0,51.7 4.41l0.12,-1a26.9,26.9 0,0 0,-1.69 -13.13zM20.15,38.43l0.36,0.18zM26.15,22.73zM47.62,19.42z">
|
||||
- <aapt:attr name="android:fillColor">
|
||||
- <gradient android:endX="4.825955" android:endY="50.964695"
|
||||
- android:startX="45.6871" android:startY="8.501661" android:type="linear">
|
||||
- <item android:color="#FFFFF44F" android:offset="0.05"/>
|
||||
- <item android:color="#FFFF980E" android:offset="0.37"/>
|
||||
- <item android:color="#FFFF3647" android:offset="0.53"/>
|
||||
- <item android:color="#FFE31587" android:offset="0.7"/>
|
||||
- </gradient>
|
||||
- </aapt:attr>
|
||||
- </path>
|
||||
- <path android:pathData="M50.15,18.05c-1.13,-2.72 -3.43,-5.66 -5.23,-6.59a26.79,26.79 0,0 1,2.64 7.91,23.55 23.55,0 0,1 -0.81,17.57c-3,6.4 -10.21,13 -21.51,12.65 -12.22,-0.35 -23,-9.41 -25,-21.29a11.22,11.22 0,0 1,0.18 -4.34,19.61 19.61,0 0,0 -0.4,3.64L0.02,27.77a26,26 0,0 0,51.7 4.41l0.12,-1a26.9,26.9 0,0 0,-1.69 -13.13z">
|
||||
- <aapt:attr name="android:fillColor">
|
||||
- <gradient android:centerX="45.955353"
|
||||
- android:centerY="11.459999"
|
||||
- android:gradientRadius="53.746708" android:type="radial">
|
||||
- <item android:color="#FFFFBD4F" android:offset="0.13"/>
|
||||
- <item android:color="#FFFF980E" android:offset="0.28"/>
|
||||
- <item android:color="#FFFF3750" android:offset="0.47"/>
|
||||
- <item android:color="#FFEB0878" android:offset="0.78"/>
|
||||
- <item android:color="#FFE50080" android:offset="0.86"/>
|
||||
- </gradient>
|
||||
- </aapt:attr>
|
||||
- </path>
|
||||
- <path android:pathData="M50.15,18.05c-1.13,-2.72 -3.43,-5.66 -5.23,-6.59a26.79,26.79 0,0 1,2.64 7.91,23.55 23.55,0 0,1 -0.81,17.57c-3,6.4 -10.21,13 -21.51,12.65 -12.22,-0.35 -23,-9.41 -25,-21.29a11.22,11.22 0,0 1,0.18 -4.34,19.61 19.61,0 0,0 -0.4,3.64L0.02,27.77a26,26 0,0 0,51.7 4.41l0.12,-1a26.9,26.9 0,0 0,-1.69 -13.13z">
|
||||
- <aapt:attr name="android:fillColor">
|
||||
- <gradient android:centerX="25.630222"
|
||||
- android:centerY="28.77216"
|
||||
- android:gradientRadius="55.090374" android:type="radial">
|
||||
- <item android:color="#FF960E18" android:offset="0.3"/>
|
||||
- <item android:color="#BCB11927" android:offset="0.35"/>
|
||||
- <item android:color="#56DB293D" android:offset="0.43"/>
|
||||
- <item android:color="#16F5334B" android:offset="0.5"/>
|
||||
- <item android:color="#00FF3750" android:offset="0.53"/>
|
||||
- </gradient>
|
||||
- </aapt:attr>
|
||||
- </path>
|
||||
- <path android:pathData="M37.49,21.11l0.17,0.12a14.35,14.35 0,0 0,-2.42 -3.15c-8.09,-8.09 -2.12,-17.55 -1.12,-18a19,19 0,0 0,-9 14.46h0.92a13.13,13.13 0,0 1,11.45 6.57z">
|
||||
- <aapt:attr name="android:fillColor">
|
||||
- <gradient android:centerX="31.1392"
|
||||
- android:centerY="-2.457998"
|
||||
- android:gradientRadius="29.609999" android:type="radial">
|
||||
- <item android:color="#FFFFF44F" android:offset="0.13"/>
|
||||
- <item android:color="#FFFF980E" android:offset="0.53"/>
|
||||
- </gradient>
|
||||
- </aapt:attr>
|
||||
- </path>
|
||||
- <path android:pathData="M26.1,22.77c0,0.65 -2.33,2.88 -3.13,2.88 -7.4,0 -8.6,4.48 -8.6,4.48a11,11 0,0 0,6.13 8.52l0.44,0.21a12.13,12.13 0,0 0,0.76 0.31,11.91 11.91,0 0,0 3.39,0.66c13,0.61 15.49,-15.52 6.13,-20.2a9,9 0,0 1,6.27 1.52,13.13 13.13,0 0,0 -11.4,-6.66h-0.92A12.92,12.92 0,0 0,18.02 17.26c0.39,0.34 0.84,0.78 1.79,1.71 1.75,1.8 6.28,3.55 6.29,3.8z">
|
||||
- <aapt:attr name="android:fillColor">
|
||||
- <gradient android:centerX="20.335398"
|
||||
- android:centerY="43.06355"
|
||||
- android:gradientRadius="26.210001" android:type="radial">
|
||||
- <item android:color="#FF3A8EE6" android:offset="0.35"/>
|
||||
- <item android:color="#FF9059FF" android:offset="0.67"/>
|
||||
- <item android:color="#FFC139E6" android:offset="1"/>
|
||||
- </gradient>
|
||||
- </aapt:attr>
|
||||
- </path>
|
||||
- <path android:pathData="M26.1,22.77c0,0.65 -2.33,2.88 -3.13,2.88 -7.4,0 -8.6,4.48 -8.6,4.48a11,11 0,0 0,6.13 8.52l0.44,0.21a12.13,12.13 0,0 0,0.76 0.31,11.91 11.91,0 0,0 3.39,0.66c13,0.61 15.49,-15.52 6.13,-20.2a9,9 0,0 1,6.27 1.52,13.13 13.13,0 0,0 -11.4,-6.66h-0.92A12.92,12.92 0,0 0,18.02 17.26c0.39,0.34 0.84,0.78 1.79,1.71 1.75,1.8 6.28,3.55 6.29,3.8z">
|
||||
- <aapt:attr name="android:fillColor">
|
||||
- <gradient android:centerX="25.19928"
|
||||
- android:centerY="23.053501"
|
||||
- android:gradientRadius="13.91751" android:type="radial">
|
||||
- <item android:color="#009059FF" android:offset="0.21"/>
|
||||
- <item android:color="#996E008B" android:offset="0.97"/>
|
||||
- </gradient>
|
||||
- </aapt:attr>
|
||||
- </path>
|
||||
- <path android:pathData="M16.79,16.39l0.54,0.36a12,12 0,0 1,-0.07 -6.36A19.21,19.21 0,0 0,11.02 15.23c0.1,0 3.87,-0.07 5.77,1.16z">
|
||||
- <aapt:attr name="android:fillColor">
|
||||
- <gradient android:centerX="24.271004"
|
||||
- android:centerY="4.029999"
|
||||
- android:gradientRadius="18.444002" android:type="radial">
|
||||
- <item android:color="#FFFFE226" android:offset="0.1"/>
|
||||
- <item android:color="#FFFF7139" android:offset="0.79"/>
|
||||
- </gradient>
|
||||
- </aapt:attr>
|
||||
- </path>
|
||||
- <path android:pathData="M0.26,28.35c2,11.88 12.77,20.94 25,21.29 11.3,0.32 18.52,-6.25 21.51,-12.65a23.55,23.55 0,0 0,0.81 -17.57c0.92,6 -2.15,11.87 -6.94,15.82 -9.34,7.61 -18.28,4.59 -20.09,3.35l-0.38,-0.19c-5.45,-2.6 -7.7,-7.56 -7.22,-11.82A6.67,6.67 0,0 1,6.76 22.77a9.8,9.8 0,0 1,9.57 -0.38A13,13 0,0 0,26.1 22.77c0,-0.21 -4.54,-2 -6.3,-3.76 -1,-0.93 -1.4,-1.37 -1.79,-1.71a10.031,10.031 0,0 0,-0.68 -0.51l-0.54,-0.36c-1.9,-1.23 -5.67,-1.16 -5.8,-1.16 -1,-1.31 -1,-5.62 -0.9,-6.52a4.39,4.39 0,0 0,-0.87 0.46,19.37 19.37,0 0,0 -2.54,2.18 22.23,22.23 0,0 0,-2.43 2.92,21.88 21.88,0 0,0 -3.5,7.88c-0.02,0.02 -0.95,4.07 -0.49,6.16z">
|
||||
- <aapt:attr name="android:fillColor">
|
||||
- <gradient android:centerX="41.62241"
|
||||
- android:centerY="-8.146102"
|
||||
- android:gradientRadius="89.61946" android:type="radial">
|
||||
- <item android:color="#FFFFF44F" android:offset="0.11"/>
|
||||
- <item android:color="#FFFF980E" android:offset="0.46"/>
|
||||
- <item android:color="#FFFF3647" android:offset="0.72"/>
|
||||
- <item android:color="#FFE31587" android:offset="0.9"/>
|
||||
- </gradient>
|
||||
- </aapt:attr>
|
||||
- </path>
|
||||
- <path android:pathData="M35.24,18.08a14.35,14.35 0,0 1,2.42 3.15l0.39,0.32c5.9,5.44 2.81,13.13 2.58,13.68 4.79,-4 7.86,-9.79 6.94,-15.82 -3,-7.34 -7.94,-10.3 -12,-16.74 -0.2,-0.33 -0.41,-0.65 -0.61,-1a5.94,5.94 0,0 1,-0.29 -0.54,4.92 4.92,0 0,1 -0.39,-1 0.07,0.07 0,0 0,-0.05 -0.07L34.12,0.06c-1,0.47 -6.97,9.93 1.12,18.02z">
|
||||
- <aapt:attr name="android:fillColor">
|
||||
- <gradient android:centerX="6.13348"
|
||||
- android:centerY="14.259094"
|
||||
- android:gradientRadius="95.36752" android:type="radial">
|
||||
- <item android:color="#FFFFF44F" android:offset="0"/>
|
||||
- <item android:color="#FFFF980E" android:offset="0.3"/>
|
||||
- <item android:color="#FFFF3647" android:offset="0.57"/>
|
||||
- <item android:color="#FFE31587" android:offset="0.74"/>
|
||||
- </gradient>
|
||||
- </aapt:attr>
|
||||
- </path>
|
||||
- <path android:pathData="M38.02,21.55l-0.39,-0.32 -0.17,-0.12a9,9 0,0 0,-6.27 -1.52c9.36,4.68 6.85,20.81 -6.13,20.2a11.91,11.91 0,0 1,-3.39 -0.66,12.13 12.13,0 0,1 -0.76,-0.31l-0.44,-0.21c1.81,1.24 10.75,4.26 20.09,-3.35 0.3,-0.58 3.39,-8.27 -2.54,-13.71z">
|
||||
- <aapt:attr name="android:fillColor">
|
||||
- <gradient android:centerX="24.90772"
|
||||
- android:centerY="9.289151"
|
||||
- android:gradientRadius="56.180176" android:type="radial">
|
||||
- <item android:color="#FFFFF44F" android:offset="0.14"/>
|
||||
- <item android:color="#FFFF980E" android:offset="0.48"/>
|
||||
- <item android:color="#FFFF3647" android:offset="0.66"/>
|
||||
- <item android:color="#FFE31587" android:offset="0.9"/>
|
||||
- </gradient>
|
||||
- </aapt:attr>
|
||||
- </path>
|
||||
- <path android:pathData="M14.37,30.09s1.2,-4.48 8.6,-4.48c0.8,0 3.09,-2.23 3.13,-2.88a13,13 0,0 1,-9.77 -0.38,9.8 9.8,0 0,0 -9.57,0.38 6.67,6.67 0,0 0,6.16 3.88c-0.48,4.26 1.77,9.22 7.22,11.82l0.36,0.18a11,11 0,0 1,-6.13 -8.52z">
|
||||
- <aapt:attr name="android:fillColor">
|
||||
- <gradient android:centerX="37.568623"
|
||||
- android:centerY="13.450078"
|
||||
- android:gradientRadius="60.55354" android:type="radial">
|
||||
- <item android:color="#FFFFF44F" android:offset="0.09"/>
|
||||
- <item android:color="#FFFF980E" android:offset="0.63"/>
|
||||
- </gradient>
|
||||
- </aapt:attr>
|
||||
- </path>
|
||||
- <path android:pathData="M50.15,18.05c-1.13,-2.72 -3.43,-5.66 -5.23,-6.59a26.79,26.79 0,0 1,2.64 7.91c-3,-7.34 -7.94,-10.3 -12,-16.74 -0.2,-0.33 -0.41,-0.65 -0.61,-1a5.94,5.94 0,0 1,-0.29 -0.54,4.92 4.92,0 0,1 -0.39,-1 0.07,0.07 0,0 0,-0.05 -0.07h-0.07a19,19 0,0 0,-9 14.46h0.92a13.13,13.13 0,0 1,11.4 6.66,9 9,0 0,0 -6.27,-1.52c9.36,4.68 6.85,20.81 -6.13,20.2a11.91,11.91 0,0 1,-3.39 -0.66,12.13 12.13,0 0,1 -0.76,-0.31l-0.44,-0.21 -0.38,-0.19 0.36,0.18a11,11 0,0 1,-6.13 -8.52s1.2,-4.48 8.6,-4.48c0.8,0 3.09,-2.23 3.13,-2.88 0,-0.21 -4.54,-2 -6.3,-3.76 -1,-0.93 -1.4,-1.37 -1.79,-1.71A10.031,10.031 0,0 0,17.29 16.77a12,12 0,0 1,-0.07 -6.36,19.21 19.21,0 0,0 -6.2,4.82c-1,-1.31 -1,-5.62 -0.9,-6.52a4.39,4.39 0,0 0,-0.87 0.46,19.37 19.37,0 0,0 -2.54,2.18 22.23,22.23 0,0 0,-2.43 2.92,21.88 21.88,0 0,0 -3.5,7.88v0.18a39.815,39.815 0,0 0,-0.3 1.64A31.77,31.77 0,0 0,0.02 27.6L0.02,27.77a26,26 0,0 0,51.7 4.41l0.12,-1a26.9,26.9 0,0 0,-1.69 -13.13zM47.56,19.39z">
|
||||
- <aapt:attr name="android:fillColor">
|
||||
- <gradient android:endX="9.339838" android:endY="45.985138"
|
||||
- android:startX="41.88179" android:startY="7.6808558" android:type="linear">
|
||||
- <item android:color="#CCFFF44F" android:offset="0.17"/>
|
||||
- <item android:color="#00FFF44F" android:offset="0.6"/>
|
||||
- </gradient>
|
||||
- </aapt:attr>
|
||||
- </path>
|
||||
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
+ xmlns:aapt="http://schemas.android.com/aapt"
|
||||
+ android:width="108dp"
|
||||
+ android:height="108dp"
|
||||
+ android:viewportWidth="32"
|
||||
+ android:viewportHeight="32">
|
||||
+ <group android:scaleX="0.64166665"
|
||||
+ android:scaleY="0.64166665"
|
||||
+ android:translateX="5.733333"
|
||||
+ android:translateY="5.733333">
|
||||
+ <path
|
||||
+ android:pathData="M10.562,5.498C10.516,5.479 10.462,5.49 10.425,5.525l-4.89,4.803c-0.118,0.116 -0.214,0.344 -0.213,0.51 0.085,9 5.054,11.624 10.426,15.6 0.133,0.098 0.349,0.098 0.482,0 5.476,-3.998 10.332,-6.331 10.447,-15.521 0.002,-0.165 -0.093,-0.395 -0.211,-0.512l-4.931,-4.88c-0.08,-0.08 -0.216,-0.023 -0.215,0.09l-0.029,4.701c-0.001,0.166 -0.135,0.299 -0.301,0.299L10.959,10.615c-0.166,0 -0.3,-0.133 -0.301,-0.299L10.641,5.615c-0,-0.051 -0.031,-0.098 -0.079,-0.117z">
|
||||
+ <aapt:attr name="android:fillColor">
|
||||
+ <gradient
|
||||
+ android:startX="5.322"
|
||||
+ android:startY="5.488"
|
||||
+ android:endX="26.678"
|
||||
+ android:endY="26.512"
|
||||
+ android:type="linear">
|
||||
+ <item android:offset="0" android:color="#AEFF0E00"/>
|
||||
+ <item android:offset="1" android:color="#FFFFD500"/>
|
||||
+ </gradient>
|
||||
+ </aapt:attr>
|
||||
+ </path>
|
||||
+ <path
|
||||
+ android:pathData="m21.32,15.949c-1.995,3.338 -2.095,3.239 -3.345,1.988"
|
||||
+ android:fillColor="#ffffff"/>
|
||||
+ <path
|
||||
+ android:pathData="m10.627,15.949c1.995,3.338 2.095,3.239 3.345,1.988"
|
||||
+ android:fillColor="#ffffff"/>
|
||||
+ </group>
|
||||
</vector>
|
||||
|
||||
Reference in New Issue
Block a user