mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-05-08 09:18:39 +01:00
Implement new ways to connect splash and megaphone.
This commit is contained in:
Alex Hart
committed by
Greyson Parrelli
Greyson Parrelli
parent
7b9554a42c
commit
2c554a3a20
@@ -34,6 +34,7 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels;
|
|||||||
import org.thoughtcrime.securesms.notifications.TurnOnNotificationsBottomSheet;
|
import org.thoughtcrime.securesms.notifications.TurnOnNotificationsBottomSheet;
|
||||||
import org.thoughtcrime.securesms.profiles.AvatarHelper;
|
import org.thoughtcrime.securesms.profiles.AvatarHelper;
|
||||||
import org.thoughtcrime.securesms.profiles.manage.EditProfileActivity;
|
import org.thoughtcrime.securesms.profiles.manage.EditProfileActivity;
|
||||||
|
import org.thoughtcrime.securesms.profiles.username.NewWaysToConnectDialogFragment;
|
||||||
import org.thoughtcrime.securesms.recipients.Recipient;
|
import org.thoughtcrime.securesms.recipients.Recipient;
|
||||||
import org.thoughtcrime.securesms.util.FeatureFlags;
|
import org.thoughtcrime.securesms.util.FeatureFlags;
|
||||||
import org.thoughtcrime.securesms.util.ServiceUtil;
|
import org.thoughtcrime.securesms.util.ServiceUtil;
|
||||||
@@ -340,13 +341,13 @@ public final class Megaphones {
|
|||||||
|
|
||||||
public static @NonNull Megaphone buildSetUpYourUsernameMegaphone(@NonNull Context context) {
|
public static @NonNull Megaphone buildSetUpYourUsernameMegaphone(@NonNull Context context) {
|
||||||
return new Megaphone.Builder(Event.SET_UP_YOUR_USERNAME, Megaphone.Style.BASIC)
|
return new Megaphone.Builder(Event.SET_UP_YOUR_USERNAME, Megaphone.Style.BASIC)
|
||||||
.setTitle(R.string.SetUpYourUsername__set_up_your_signal_username)
|
.setTitle(R.string.NewWaysToConnectDialogFragment__new_ways_to_connect)
|
||||||
.setBody(R.string.SetUpYourUsername__usernames_let_others)
|
.setBody(R.string.SetUpYourUsername__introducing_phone_number_privacy)
|
||||||
.setImage(R.drawable.usernames_64)
|
.setImage(R.drawable.usernames_megaphone)
|
||||||
.setActionButton(R.string.SetUpYourUsername__continue, (megaphone, controller) -> {
|
.setActionButton(R.string.SetUpYourUsername__learn_more, (megaphone, controller) -> {
|
||||||
controller.onMegaphoneNavigationRequested(EditProfileActivity.getIntentForUsernameEdit(context));
|
controller.onMegaphoneDialogFragmentRequested(new NewWaysToConnectDialogFragment());
|
||||||
})
|
})
|
||||||
.setSecondaryButton(R.string.SetUpYourUsername__not_now, (megaphone, controller) -> {
|
.setSecondaryButton(R.string.SetUpYourUsername__dismiss, (megaphone, controller) -> {
|
||||||
controller.onMegaphoneCompleted(Event.SET_UP_YOUR_USERNAME);
|
controller.onMegaphoneCompleted(Event.SET_UP_YOUR_USERNAME);
|
||||||
})
|
})
|
||||||
.build();
|
.build();
|
||||||
@@ -360,7 +361,7 @@ public final class Megaphones {
|
|||||||
.setActionButton(R.string.GrantFullScreenIntentPermission_megaphone_turn_on, (megaphone, controller) -> {
|
.setActionButton(R.string.GrantFullScreenIntentPermission_megaphone_turn_on, (megaphone, controller) -> {
|
||||||
controller.onMegaphoneDialogFragmentRequested(TurnOnNotificationsBottomSheet.turnOnFullScreenIntentFragment(context));
|
controller.onMegaphoneDialogFragmentRequested(TurnOnNotificationsBottomSheet.turnOnFullScreenIntentFragment(context));
|
||||||
})
|
})
|
||||||
.setSecondaryButton(R.string.SetUpYourUsername__not_now, (megaphone, controller) -> {
|
.setSecondaryButton(R.string.GrantFullScreenIntentPermission_megaphone_not_now, (megaphone, controller) -> {
|
||||||
controller.onMegaphoneCompleted(Event.GRANT_FULL_SCREEN_INTENT);
|
controller.onMegaphoneCompleted(Event.GRANT_FULL_SCREEN_INTENT);
|
||||||
})
|
})
|
||||||
.build();
|
.build();
|
||||||
|
|||||||
+200
@@ -0,0 +1,200 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2024 Signal Messenger, LLC
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.thoughtcrime.securesms.profiles.username
|
||||||
|
|
||||||
|
import android.os.Bundle
|
||||||
|
import androidx.compose.foundation.Image
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.defaultMinSize
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.size
|
||||||
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TextButton
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.graphics.painter.Painter
|
||||||
|
import androidx.compose.ui.res.dimensionResource
|
||||||
|
import androidx.compose.ui.res.painterResource
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import org.signal.core.ui.Buttons
|
||||||
|
import org.signal.core.ui.Previews
|
||||||
|
import org.signal.core.ui.Scaffolds
|
||||||
|
import org.thoughtcrime.securesms.R
|
||||||
|
import org.thoughtcrime.securesms.compose.ComposeDialogFragment
|
||||||
|
import org.thoughtcrime.securesms.profiles.manage.EditProfileActivity
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Displays an explanation page about usernames and gives the user
|
||||||
|
* the opportunity to set one up now.
|
||||||
|
*/
|
||||||
|
class NewWaysToConnectDialogFragment : ComposeDialogFragment() {
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
|
setStyle(STYLE_NO_FRAME, R.style.Signal_DayNight_Dialog_FullScreen)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
override fun DialogContent() {
|
||||||
|
NewWaysToConnectDialogContent(
|
||||||
|
onSetUpUsernameClick = {
|
||||||
|
startActivity(EditProfileActivity.getIntentForUsernameEdit(requireContext()))
|
||||||
|
dismissAllowingStateLoss()
|
||||||
|
},
|
||||||
|
onNotNowClick = { dismissAllowingStateLoss() }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview
|
||||||
|
@Composable
|
||||||
|
private fun PreviewNewWaysToConnectDialogContent() {
|
||||||
|
Previews.Preview {
|
||||||
|
NewWaysToConnectDialogContent(
|
||||||
|
onSetUpUsernameClick = {},
|
||||||
|
onNotNowClick = {}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun NewWaysToConnectDialogContent(
|
||||||
|
onSetUpUsernameClick: () -> Unit,
|
||||||
|
onNotNowClick: () -> Unit
|
||||||
|
) {
|
||||||
|
Scaffolds.Settings(
|
||||||
|
title = "",
|
||||||
|
onNavigationClick = onNotNowClick,
|
||||||
|
navigationIconPainter = painterResource(id = R.drawable.symbol_x_24)
|
||||||
|
) {
|
||||||
|
Column(modifier = Modifier.padding(it)) {
|
||||||
|
Text(
|
||||||
|
text = stringResource(id = R.string.NewWaysToConnectDialogFragment__new_ways_to_connect),
|
||||||
|
style = MaterialTheme.typography.headlineMedium,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
|
||||||
|
.padding(top = 16.dp, bottom = 36.dp)
|
||||||
|
)
|
||||||
|
|
||||||
|
LazyColumn(modifier = Modifier.weight(1f)) {
|
||||||
|
item {
|
||||||
|
NewWaysToConnectRowItem(
|
||||||
|
title = stringResource(id = R.string.NewWaysToConnectDialogFragment__phone_number_privacy),
|
||||||
|
description = stringResource(id = R.string.NewWaysToConnectDialogFragment__your_phone_number_is_no_longer_shared),
|
||||||
|
image = painterResource(id = R.drawable.phone_48_color)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
item {
|
||||||
|
NewWaysToConnectRowItem(
|
||||||
|
title = stringResource(id = R.string.NewWaysToConnectDialogFragment__usernames),
|
||||||
|
description = stringResource(id = R.string.NewWaysToConnectDialogFragment__people_can_now_message_you_using_your_optional_username),
|
||||||
|
image = painterResource(id = R.drawable.usernames_48_color)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
item {
|
||||||
|
NewWaysToConnectRowItem(
|
||||||
|
title = stringResource(id = R.string.NewWaysToConnectDialogFragment__qr_codes_and_links),
|
||||||
|
description = stringResource(id = R.string.NewWaysToConnectDialogFragment__usernames_have_a_unique_qr_code),
|
||||||
|
image = painterResource(id = R.drawable.qr_codes_48_color)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Buttons.LargeTonal(
|
||||||
|
onClick = onSetUpUsernameClick,
|
||||||
|
modifier = Modifier
|
||||||
|
.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
|
||||||
|
.padding(top = 36.dp)
|
||||||
|
.defaultMinSize(minWidth = 221.dp)
|
||||||
|
.align(alignment = Alignment.CenterHorizontally)
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
text = stringResource(id = R.string.NewWaysToConnectDialogFragment__set_up_your_username)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
TextButton(
|
||||||
|
onClick = onNotNowClick,
|
||||||
|
modifier = Modifier
|
||||||
|
.padding(
|
||||||
|
horizontal = dimensionResource(id = R.dimen.core_ui__gutter),
|
||||||
|
vertical = 36.dp
|
||||||
|
)
|
||||||
|
.defaultMinSize(minWidth = 221.dp)
|
||||||
|
.align(alignment = Alignment.CenterHorizontally)
|
||||||
|
) {
|
||||||
|
Text(text = stringResource(id = R.string.NewWaysToConnectDialogFragment__not_now))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview
|
||||||
|
@Composable
|
||||||
|
private fun PreviewNewWaysToConnectRowItem() {
|
||||||
|
Previews.Preview {
|
||||||
|
NewWaysToConnectRowItem(
|
||||||
|
title = "Example Item",
|
||||||
|
description = "Sample text for the subtitle of the example",
|
||||||
|
image = painterResource(id = R.drawable.symbol_album_tilt_24)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun NewWaysToConnectRowItem(
|
||||||
|
title: String,
|
||||||
|
description: String,
|
||||||
|
image: Painter,
|
||||||
|
modifier: Modifier = Modifier
|
||||||
|
) {
|
||||||
|
Row(
|
||||||
|
modifier = modifier
|
||||||
|
.padding(
|
||||||
|
horizontal = dimensionResource(id = R.dimen.core_ui__gutter)
|
||||||
|
)
|
||||||
|
.padding(
|
||||||
|
bottom = 40.dp
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
Image(
|
||||||
|
painter = image,
|
||||||
|
contentDescription = null,
|
||||||
|
modifier = Modifier
|
||||||
|
.padding(
|
||||||
|
start = 12.dp,
|
||||||
|
top = 4.dp,
|
||||||
|
end = 24.dp
|
||||||
|
)
|
||||||
|
.size(48.dp)
|
||||||
|
)
|
||||||
|
Column {
|
||||||
|
Text(
|
||||||
|
text = title,
|
||||||
|
style = MaterialTheme.typography.titleMedium
|
||||||
|
)
|
||||||
|
Text(
|
||||||
|
text = description,
|
||||||
|
style = MaterialTheme.typography.bodyLarge,
|
||||||
|
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
|
modifier = Modifier.padding(top = 2.dp, end = 8.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="48dp"
|
||||||
|
android:height="48dp"
|
||||||
|
android:viewportWidth="48"
|
||||||
|
android:viewportHeight="48">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFF3D48F"
|
||||||
|
android:pathData="M16.07 9.56c-1.45-1.9-4.25-2.1-5.94-0.4L9.28 10c-2.7 2.72-4.06 6.61-2.81 10.24 1.79 5.24 4.78 10.16 8.95 14.34 4.18 4.17 9.1 7.16 14.34 8.95 3.63 1.25 7.52-0.1 10.24-2.81l0.84-0.85c1.7-1.7 1.5-4.49-0.4-5.94l-5.55-4.22c-1.57-1.2-3.79-1.04-5.18 0.35l-2.42 2.42c-0.77 0.77-3.58-0.79-6.28-3.49s-4.26-5.5-3.5-6.28l2.43-2.42c1.4-1.4 1.54-3.6 0.35-5.18l-4.22-5.55Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFDBB96E"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M20.3 19.87c1.15-1.39 1.21-3.4 0.1-4.85l-4.16-5.48c-1.36-1.79-3.93-2.05-5.61-0.63 0.2 5.55 4.32 10.1 9.68 10.96Zm9.08 10.25l0.33-0.33c1.38-1.37 3.57-1.52 5.12-0.34l5.48 4.16c1.46 1.11 1.9 3.03 1.25 4.6-0.38 0.04-0.76 0.06-1.15 0.06-5.2 0-9.58-3.43-11.03-8.15Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF000000"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M7.87 8.59l0.85-0.85c2.55-2.55 6.76-2.26 8.94 0.6l4.22 5.56c1.8 2.37 1.57 5.7-0.53 7.8l-1.9 1.91c0.05 0.15 0.14 0.33 0.26 0.55 0.52 0.93 1.46 2.16 2.71 3.42 1.26 1.25 2.5 2.2 3.42 2.7 0.22 0.13 0.4 0.22 0.55 0.28l1.9-1.91c2.1-2.1 5.44-2.33 7.8-0.53l5.56 4.22c2.87 2.18 3.16 6.4 0.6 8.94l-0.84 0.85c-3.11 3.11-7.78 4.84-12.3 3.3-5.52-1.9-10.7-5.04-15.1-9.44-4.4-4.4-7.55-9.58-9.44-15.1-1.54-4.52 0.19-9.19 3.3-12.3Zm18.92 22.1h-0.03 0.03Zm-7.47-7.48v0.03-0.03ZM10.13 9.16c1.7-1.7 4.49-1.5 5.94 0.4l4.22 5.55c1.2 1.57 1.04 3.79-0.35 5.18l-2.42 2.42c-0.77 0.77 0.79 3.58 3.49 6.28s5.5 4.26 6.28 3.5l2.42-2.43c1.4-1.4 3.6-1.54 5.18-0.35l5.55 4.22c1.9 1.45 2.1 4.25 0.4 5.94L40 40.72c-2.72 2.7-6.61 4.06-10.24 2.81-5.24-1.79-10.16-4.78-14.34-8.95-4.17-4.18-7.16-9.1-8.95-14.34-1.25-3.63 0.1-7.52 2.81-10.24l0.85-0.84Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFD9D9D9"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M34 2c-2.76 0-5 2.24-5 5v2h3V7c0-1.1 0.9-2 2-2s2 0.9 2 2v2h3V7c0-2.76-2.24-5-5-5Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF000000"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M34 2.88c-2.28 0-4.13 1.84-4.13 4.12v3h-1.75V7c0-3.24 2.64-5.88 5.88-5.88 3.24 0 5.88 2.64 5.88 5.88v3h-1.76V7c0-2.28-1.84-4.13-4.12-4.13Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF000000"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M34 5.88c-0.62 0-1.13 0.5-1.13 1.12v2h-1.74V7c0-1.59 1.28-2.88 2.87-2.88s2.88 1.3 2.88 2.88v2h-1.76V7c0-0.62-0.5-1.13-1.12-1.13Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFD3D3D3"
|
||||||
|
android:pathData="M28.5 12c0-1.1 0.9-2 2-2h7c1.1 0 2 0.9 2 2v6c0 1.1-0.9 2-2 2h-7c-1.1 0-2-0.9-2-2v-6Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF000000"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M30.5 8.3h7c2.04 0 3.7 1.66 3.7 3.7v6c0 2.04-1.66 3.7-3.7 3.7h-7c-2.04 0-3.7-1.66-3.7-3.7v-6c0-2.04 1.66-3.7 3.7-3.7Zm0 1.7c-1.1 0-2 0.9-2 2v6c0 1.1 0.9 2 2 2h7c1.1 0 2-0.9 2-2v-6c0-1.1-0.9-2-2-2h-7Z"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="48dp"
|
||||||
|
android:height="48dp"
|
||||||
|
android:viewportWidth="48"
|
||||||
|
android:viewportHeight="48">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M3.08 23.73c-1.15-4.27 1.39-8.66 5.65-9.8L24.2 9.79c4.27-1.15 8.65 1.39 9.8 5.65l4.13 15.46c1.15 4.27-1.39 8.65-5.66 9.8l-15.45 4.14c-4.27 1.14-8.65-1.39-9.8-5.66L3.08 23.73Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF000000"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M8.22 12l15.45-4.15c5.34-1.42 10.82 1.74 12.25 7.08l4.13 15.45c1.43 5.34-1.73 10.82-7.07 12.25l-15.45 4.14C12.19 48.2 6.7 45.03 5.28 39.7L1.14 24.24C-0.28 18.91 2.88 13.43 8.22 12Zm0.51 1.93c-4.26 1.14-6.8 5.53-5.65 9.8L7.2 39.18c1.15 4.27 5.53 6.8 9.8 5.66l15.45-4.14c4.27-1.15 6.8-5.53 5.66-9.8L34 15.44c-1.15-4.26-5.53-6.8-9.8-5.65L8.73 13.93Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:pathData="M7.94 22.57c-0.45-1.68 0.55-3.4 2.23-3.85l15.17-4.07c1.68-0.45 3.4 0.55 3.85 2.23l4.07 15.18c0.45 1.67-0.55 3.4-2.23 3.84l-15.17 4.07c-1.68 0.45-3.4-0.54-3.85-2.22L7.94 22.57Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M14.55 24.28c-0.08-0.3 0.1-0.61 0.4-0.7l0.72-0.19c0.3-0.08 0.6 0.1 0.69 0.4l0.2 0.72c0.07 0.3-0.1 0.61-0.4 0.7l-0.73 0.19c-0.3 0.08-0.6-0.1-0.69-0.4l-0.2-0.72Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M13.65 21.31l2-0.53c0.29-0.08 0.54-0.15 0.75-0.19 0.23-0.04 0.46-0.06 0.71 0 0.37 0.07 0.7 0.27 0.96 0.55 0.17 0.19 0.27 0.4 0.35 0.62 0.07 0.2 0.14 0.45 0.21 0.74l0.54 2c0.07 0.28 0.14 0.53 0.18 0.75 0.04 0.22 0.06 0.46 0 0.7-0.07 0.38-0.26 0.71-0.54 0.96-0.2 0.17-0.4 0.27-0.62 0.35-0.2 0.07-0.46 0.14-0.74 0.22l-2 0.53c-0.29 0.08-0.54 0.15-0.75 0.19-0.23 0.04-0.46 0.06-0.71 0-0.37-0.07-0.7-0.27-0.96-0.55-0.17-0.19-0.27-0.4-0.35-0.62-0.07-0.2-0.14-0.45-0.21-0.74l-0.54-2c-0.08-0.28-0.14-0.53-0.18-0.74-0.04-0.23-0.06-0.47 0-0.72 0.07-0.37 0.26-0.7 0.54-0.95 0.2-0.17 0.4-0.27 0.62-0.35 0.2-0.07 0.46-0.14 0.74-0.22Zm-0.3 1.45c-0.13 0.05-0.17 0.08-0.18 0.1-0.07 0.06-0.13 0.15-0.15 0.24l0.02 0.21 0.16 0.67 0.53 1.95c0.08 0.32 0.14 0.51 0.19 0.66 0.05 0.14 0.08 0.18 0.09 0.19 0.06 0.07 0.15 0.12 0.25 0.14 0.01 0 0.06 0.01 0.2-0.02 0.16-0.02 0.35-0.08 0.67-0.16l1.95-0.52c0.32-0.09 0.52-0.14 0.66-0.2 0.14-0.04 0.18-0.07 0.19-0.08 0.07-0.07 0.12-0.16 0.14-0.25 0-0.02 0.01-0.06-0.01-0.2-0.03-0.16-0.08-0.36-0.17-0.67l-0.52-1.96c-0.08-0.32-0.14-0.51-0.19-0.66-0.05-0.14-0.08-0.17-0.09-0.19-0.07-0.07-0.15-0.12-0.25-0.14-0.01 0-0.06-0.01-0.2 0.02-0.16 0.02-0.36 0.08-0.67 0.16l-1.96 0.52c-0.31 0.09-0.5 0.14-0.66 0.2Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M17.08 31.56c-0.3 0.08-0.48 0.39-0.4 0.69l0.2 0.72c0.07 0.3 0.38 0.48 0.68 0.4l0.73-0.2c0.3-0.08 0.48-0.39 0.4-0.69l-0.2-0.72c-0.08-0.3-0.39-0.48-0.69-0.4l-0.72 0.2Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M15.78 29.28l2-0.53c0.3-0.08 0.54-0.15 0.75-0.19 0.23-0.04 0.47-0.06 0.72 0 0.36 0.07 0.7 0.27 0.95 0.55 0.17 0.19 0.27 0.4 0.35 0.62 0.07 0.2 0.14 0.45 0.22 0.74l0.53 2c0.08 0.28 0.14 0.53 0.18 0.74 0.04 0.23 0.06 0.47 0.01 0.72-0.08 0.37-0.27 0.7-0.55 0.95-0.19 0.17-0.4 0.27-0.62 0.35-0.2 0.07-0.45 0.14-0.74 0.22l-2 0.53c-0.29 0.08-0.54 0.15-0.75 0.19-0.22 0.04-0.46 0.06-0.71 0-0.37-0.07-0.7-0.27-0.95-0.55-0.18-0.19-0.28-0.4-0.35-0.62-0.08-0.2-0.14-0.45-0.22-0.74l-0.54-2c-0.07-0.28-0.14-0.53-0.18-0.75-0.04-0.22-0.06-0.46 0-0.7 0.07-0.38 0.27-0.71 0.54-0.96 0.2-0.17 0.41-0.28 0.63-0.35l0.73-0.22Zm-0.3 1.45c-0.13 0.05-0.17 0.08-0.18 0.1-0.07 0.06-0.12 0.15-0.14 0.24 0 0.02-0.01 0.06 0.01 0.2 0.03 0.16 0.08 0.36 0.17 0.67l0.52 1.96c0.09 0.32 0.14 0.51 0.2 0.66 0.04 0.14 0.07 0.17 0.08 0.19 0.07 0.07 0.15 0.12 0.25 0.14 0.02 0 0.06 0.01 0.2-0.02 0.16-0.02 0.36-0.08 0.67-0.16l1.96-0.52c0.31-0.09 0.51-0.14 0.66-0.2 0.14-0.04 0.17-0.07 0.18-0.08 0.08-0.07 0.13-0.16 0.15-0.25l-0.02-0.21-0.16-0.67-0.53-1.95c-0.08-0.32-0.13-0.51-0.19-0.66-0.05-0.14-0.08-0.18-0.09-0.19-0.06-0.07-0.15-0.12-0.25-0.14-0.01 0-0.06-0.01-0.2 0.02-0.15 0.02-0.35 0.08-0.67 0.16l-1.95 0.52c-0.32 0.09-0.52 0.14-0.66 0.2Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M22.91 21.45c-0.3 0.08-0.47 0.39-0.4 0.7l0.2 0.71c0.08 0.3 0.39 0.48 0.69 0.4l0.72-0.2c0.3-0.07 0.48-0.38 0.4-0.68l-0.2-0.72c-0.07-0.3-0.38-0.48-0.68-0.4l-0.73 0.2Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M21.62 19.18c-0.28 0.07-0.54 0.14-0.74 0.21-0.21 0.08-0.43 0.18-0.62 0.35-0.28 0.25-0.47 0.59-0.55 0.96-0.05 0.25-0.03 0.48 0 0.71l0.19 0.75 0.54 2c0.07 0.28 0.14 0.53 0.21 0.74 0.08 0.21 0.18 0.43 0.35 0.62 0.25 0.28 0.59 0.47 0.95 0.55 0.25 0.05 0.5 0.03 0.72 0 0.2-0.05 0.46-0.11 0.74-0.2l2-0.53c0.3-0.07 0.54-0.14 0.74-0.21 0.22-0.08 0.44-0.18 0.63-0.35 0.28-0.25 0.47-0.59 0.55-0.96 0.05-0.25 0.03-0.48-0.01-0.71-0.04-0.21-0.1-0.46-0.18-0.75l-0.54-2c-0.08-0.28-0.14-0.53-0.21-0.74-0.08-0.21-0.18-0.43-0.35-0.62-0.26-0.28-0.59-0.47-0.96-0.55-0.25-0.05-0.49-0.03-0.71 0-0.21 0.05-0.46 0.11-0.75 0.2l-2 0.53Zm-0.48 1.54c0-0.01 0.04-0.04 0.18-0.1l0.66-0.18 1.96-0.52 0.66-0.17c0.15-0.03 0.2-0.02 0.2-0.02 0.1 0.03 0.2 0.08 0.26 0.15 0 0.01 0.04 0.05 0.09 0.19l0.19 0.65 0.52 1.96c0.09 0.31 0.14 0.51 0.17 0.67 0.02 0.14 0.02 0.19 0.01 0.2-0.02 0.1-0.07 0.19-0.14 0.25-0.01 0.01-0.05 0.04-0.19 0.1l-0.66 0.18-1.95 0.53-0.67 0.16c-0.14 0.03-0.19 0.02-0.2 0.02-0.1-0.03-0.19-0.08-0.25-0.15-0.01-0.01-0.04-0.05-0.1-0.19L21.7 23.8l-0.53-1.96-0.16-0.67c-0.03-0.14-0.02-0.19-0.02-0.2 0.02-0.1 0.07-0.19 0.15-0.25Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M22.52 27.96c-0.3 0.08-0.48 0.4-0.4 0.7l0.2 0.72c0.08 0.3 0.39 0.47 0.69 0.4l0.72-0.2c0.3-0.08 0.48-0.39 0.4-0.69l-0.2-0.72c-0.08-0.3-0.38-0.48-0.68-0.4l-0.73 0.2Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M24.65 30.11c-0.08-0.3 0.1-0.6 0.4-0.69l0.72-0.2c0.3-0.07 0.61 0.1 0.69 0.4l0.2 0.73c0.07 0.3-0.1 0.6-0.4 0.69l-0.73 0.2c-0.3 0.07-0.6-0.1-0.69-0.4l-0.2-0.73Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M27.17 31.57c-0.08-0.3 0.1-0.61 0.4-0.7l0.73-0.18c0.3-0.09 0.6 0.1 0.69 0.4l0.19 0.72c0.08 0.3-0.1 0.6-0.4 0.69l-0.72 0.2c-0.3 0.07-0.61-0.1-0.7-0.4l-0.19-0.73Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M26.5 26.9c-0.3 0.08-0.47 0.38-0.4 0.68l0.2 0.73c0.08 0.3 0.4 0.48 0.7 0.4l0.72-0.2c0.3-0.08 0.47-0.39 0.4-0.69l-0.2-0.72c-0.08-0.3-0.39-0.48-0.69-0.4l-0.72 0.2Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M23.19 32.64c-0.08-0.3 0.1-0.61 0.4-0.7l0.72-0.19c0.3-0.08 0.61 0.1 0.7 0.4l0.19 0.73c0.08 0.3-0.1 0.6-0.4 0.68l-0.73 0.2c-0.3 0.08-0.6-0.1-0.69-0.4l-0.19-0.72Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF88A5E4"
|
||||||
|
android:pathData="M14 10c0-4.42 3.59-8 8-8h16c4.42 0 8 3.58 8 8v16c0 4.42-3.58 8-8 8H22c-4.42 0-8-3.58-8-8V10Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF000000"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M22 0h16c5.53 0 10 4.48 10 10v16c0 5.52-4.48 10-10 10H22c-5.52 0-10-4.48-10-10V10c0-5.52 4.48-10 10-10Zm0 2c-4.41 0-8 3.58-8 8v16c0 4.42 3.58 8 8 8h16c4.42 0 8-3.58 8-8V10c0-4.42-3.58-8-8-8H22Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:pathData="M19 10.14C19 8.41 20.42 7 22.16 7h15.71c1.74 0 3.15 1.4 3.15 3.14v15.72C41 27.59 39.6 29 37.85 29H22.14C20.41 29 19 27.6 19 25.86V10.14Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M24.94 13.5c0-0.31 0.26-0.56 0.57-0.56h0.75c0.3 0 0.56 0.25 0.56 0.56v0.75c0 0.31-0.25 0.56-0.56 0.56H25.5c-0.32 0-0.57-0.25-0.57-0.56V13.5Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M24.84 10.4h2.08c0.3 0 0.55 0 0.77 0.02 0.22 0.02 0.46 0.06 0.69 0.18 0.33 0.17 0.6 0.44 0.78 0.78 0.11 0.23 0.15 0.46 0.17 0.69 0.02 0.21 0.02 0.47 0.02 0.77v2.07c0 0.3 0 0.56-0.02 0.77-0.02 0.23-0.06 0.46-0.18 0.7-0.17 0.33-0.44 0.6-0.77 0.77-0.23 0.12-0.47 0.16-0.7 0.18l-0.76 0.01h-2.08l-0.77-0.01c-0.22-0.02-0.46-0.06-0.69-0.18-0.33-0.17-0.6-0.44-0.77-0.78-0.12-0.23-0.16-0.46-0.18-0.69-0.02-0.21-0.02-0.47-0.02-0.77v-2.07c0-0.3 0-0.56 0.02-0.77 0.02-0.23 0.06-0.46 0.18-0.7 0.17-0.33 0.44-0.6 0.78-0.77 0.22-0.12 0.46-0.16 0.69-0.18l0.76-0.01Zm-0.66 1.33c-0.14 0.01-0.19 0.03-0.2 0.04-0.09 0.04-0.16 0.12-0.2 0.2-0.01 0.02-0.03 0.06-0.04 0.2l-0.02 0.7v2.02c0 0.32 0 0.53 0.02 0.68 0 0.15 0.03 0.2 0.04 0.2 0.04 0.1 0.11 0.17 0.2 0.21 0.01 0 0.06 0.03 0.2 0.04l0.69 0.01h2.02l0.69-0.01c0.15-0.01 0.19-0.03 0.2-0.04 0.09-0.04 0.16-0.12 0.2-0.2 0.01-0.02 0.03-0.06 0.04-0.2 0.02-0.16 0.02-0.37 0.02-0.7v-2.02c0-0.32 0-0.53-0.02-0.68 0-0.15-0.03-0.2-0.03-0.2-0.05-0.1-0.12-0.17-0.2-0.21-0.02 0-0.06-0.03-0.21-0.04l-0.69-0.01h-2.02l-0.69 0.01Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M25.5 21.19c-0.3 0-0.56 0.25-0.56 0.56v0.75c0 0.31 0.25 0.56 0.56 0.56h0.75c0.31 0 0.57-0.25 0.57-0.56v-0.75c0-0.31-0.26-0.56-0.57-0.56H25.5Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M24.84 18.66h2.08l0.76 0.01c0.23 0.02 0.47 0.06 0.7 0.18 0.33 0.17 0.6 0.44 0.77 0.78 0.12 0.23 0.16 0.46 0.18 0.69 0.02 0.21 0.02 0.47 0.02 0.77v2.07c0 0.3 0 0.56-0.02 0.77-0.02 0.23-0.06 0.46-0.18 0.7-0.17 0.33-0.44 0.6-0.78 0.77-0.22 0.12-0.46 0.16-0.69 0.18l-0.76 0.01h-2.08l-0.77-0.01c-0.22-0.02-0.46-0.06-0.69-0.18-0.33-0.17-0.6-0.44-0.78-0.78-0.11-0.23-0.15-0.46-0.17-0.69-0.02-0.21-0.02-0.47-0.02-0.77V21.1c0-0.3 0-0.56 0.02-0.77 0.02-0.23 0.06-0.46 0.17-0.7 0.18-0.33 0.45-0.6 0.78-0.77 0.23-0.12 0.47-0.16 0.7-0.18l0.76-0.01Zm-0.66 1.32c-0.15 0.01-0.19 0.03-0.2 0.04-0.09 0.04-0.16 0.12-0.2 0.2-0.01 0.02-0.03 0.06-0.04 0.2-0.02 0.16-0.02 0.37-0.02 0.7v2.02c0 0.32 0 0.53 0.02 0.68 0 0.15 0.03 0.2 0.03 0.2 0.05 0.1 0.12 0.17 0.2 0.21 0.02 0 0.06 0.03 0.21 0.04l0.69 0.01h2.02l0.69-0.01c0.14-0.01 0.19-0.03 0.2-0.04 0.09-0.04 0.16-0.12 0.2-0.2 0.01-0.02 0.03-0.06 0.04-0.2l0.01-0.7v-2.02-0.68c-0.02-0.15-0.04-0.2-0.05-0.2-0.04-0.1-0.11-0.17-0.2-0.21-0.01 0-0.06-0.03-0.2-0.04l-0.69-0.01h-2.02l-0.69 0.01Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M33.76 12.94c-0.31 0-0.57 0.25-0.57 0.56v0.75c0 0.31 0.25 0.56 0.57 0.56h0.75c0.3 0 0.56-0.25 0.56-0.56V13.5c0-0.31-0.25-0.56-0.56-0.56h-0.75Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M33.1 10.4c-0.3 0-0.56 0-0.77 0.02-0.23 0.02-0.47 0.06-0.7 0.18-0.33 0.17-0.6 0.44-0.77 0.78-0.12 0.23-0.16 0.46-0.18 0.69-0.02 0.21-0.02 0.47-0.02 0.77v2.07c0 0.3 0 0.56 0.02 0.77 0.02 0.23 0.06 0.46 0.18 0.7 0.17 0.33 0.44 0.6 0.77 0.77 0.23 0.12 0.47 0.16 0.7 0.18l0.76 0.01h2.08l0.76-0.01c0.23-0.02 0.47-0.06 0.7-0.18 0.33-0.17 0.6-0.44 0.77-0.78 0.12-0.23 0.16-0.46 0.18-0.69 0.02-0.21 0.02-0.47 0.02-0.77v-2.07c0-0.3 0-0.56-0.02-0.77-0.02-0.23-0.06-0.46-0.17-0.7-0.17-0.33-0.45-0.6-0.78-0.77-0.23-0.12-0.47-0.16-0.7-0.18l-0.76-0.01h-2.08Zm-0.87 1.37c0.01 0 0.06-0.03 0.2-0.04l0.69-0.01h2.02l0.69 0.01c0.15 0.01 0.19 0.03 0.2 0.04 0.09 0.04 0.16 0.12 0.2 0.2 0.01 0.02 0.03 0.06 0.04 0.2 0.02 0.16 0.02 0.37 0.02 0.7v2.02c0 0.32 0 0.53-0.02 0.68 0 0.15-0.03 0.2-0.03 0.2-0.05 0.1-0.12 0.17-0.2 0.21-0.02 0-0.06 0.03-0.21 0.04l-0.69 0.01h-2.02l-0.69-0.01c-0.14-0.01-0.19-0.03-0.2-0.04-0.09-0.04-0.16-0.12-0.2-0.2-0.01-0.02-0.03-0.06-0.04-0.2-0.02-0.16-0.02-0.37-0.02-0.7v-2.02c0-0.32 0-0.53 0.02-0.68 0.01-0.15 0.03-0.2 0.04-0.2 0.04-0.1 0.11-0.17 0.2-0.21Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M31.7 19.13c-0.32 0-0.57 0.25-0.57 0.56v0.75c0 0.3 0.25 0.56 0.56 0.56h0.75c0.31 0 0.56-0.25 0.56-0.56v-0.75c0-0.31-0.25-0.57-0.56-0.57H31.7Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M33.2 21.75c0-0.31 0.24-0.56 0.55-0.56h0.75c0.31 0 0.57 0.25 0.57 0.56v0.75c0 0.31-0.26 0.56-0.57 0.56h-0.75c-0.3 0-0.56-0.25-0.56-0.56v-0.75Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M35.25 23.81c0-0.3 0.26-0.56 0.57-0.56h0.75c0.3 0 0.56 0.25 0.56 0.56v0.75c0 0.31-0.25 0.57-0.56 0.57h-0.75c-0.31 0-0.57-0.26-0.57-0.57v-0.75Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M35.82 19.13c-0.31 0-0.57 0.25-0.57 0.56v0.75c0 0.3 0.26 0.56 0.57 0.56h0.75c0.3 0 0.56-0.25 0.56-0.56v-0.75c0-0.31-0.25-0.57-0.56-0.57h-0.75Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M31.13 23.81c0-0.3 0.25-0.56 0.56-0.56h0.75c0.31 0 0.56 0.25 0.56 0.56v0.75c0 0.31-0.25 0.57-0.56 0.57H31.7c-0.31 0-0.56-0.26-0.56-0.57v-0.75Z"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="48dp"
|
||||||
|
android:height="48dp"
|
||||||
|
android:viewportWidth="48"
|
||||||
|
android:viewportHeight="48">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFADB4F1"
|
||||||
|
android:pathData="M48 24c0 13.25-10.75 24-24 24S0 37.25 0 24 10.75 0 24 0s24 10.75 24 24Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF000000"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M24 46c12.15 0 22-9.85 22-22S36.15 2 24 2 2 11.85 2 24s9.85 22 22 22Zm0 2c13.25 0 24-10.75 24-24S37.25 0 24 0 0 10.75 0 24s10.75 24 24 24Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M12 24c0-6.63 5.37-12 12-12s12 5.37 12 12c0 1.84-0.39 3.03-0.88 3.73-0.46 0.65-1.05 0.94-1.79 0.94-0.87 0-2-0.97-2-2.34V24c0-4.05-3.28-7.33-7.33-7.33-4.05 0-7.33 3.28-7.33 7.33 0 4.05 3.28 7.33 7.33 7.33 2.14 0 4.06-0.91 5.4-2.37 0.84 1.4 2.31 2.37 3.93 2.37 1.6 0 3-0.7 3.97-2.06 0.92-1.3 1.37-3.1 1.37-5.27 0-8.1-6.57-14.67-14.67-14.67S9.33 15.9 9.33 24 15.9 38.67 24 38.67c2.67 0 5.18-0.72 7.33-1.97 0.64-0.37 0.86-1.18 0.5-1.82-0.38-0.64-1.2-0.85-1.83-0.48-1.76 1.02-3.81 1.6-6 1.6-6.63 0-12-5.37-12-12Zm16.67 0c0-2.58-2.1-4.67-4.67-4.67-2.58 0-4.67 2.1-4.67 4.67 0 2.58 2.1 4.67 4.67 4.67 2.58 0 4.67-2.1 4.67-4.67Z"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="48dp"
|
||||||
|
android:height="48dp"
|
||||||
|
android:viewportWidth="48"
|
||||||
|
android:viewportHeight="48">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFF3D48F"
|
||||||
|
android:pathData="M16.07 9.56c-1.45-1.9-4.25-2.1-5.94-0.4L9.28 10c-2.7 2.72-4.06 6.61-2.81 10.24 1.79 5.24 4.78 10.16 8.95 14.34 4.18 4.17 9.1 7.16 14.34 8.95 3.63 1.25 7.52-0.1 10.24-2.81l0.84-0.85c1.7-1.7 1.5-4.49-0.4-5.94l-5.55-4.22c-1.57-1.2-3.79-1.04-5.18 0.35l-2.42 2.42c-0.77 0.77-3.58-0.79-6.28-3.49s-4.26-5.5-3.5-6.28l2.43-2.42c1.4-1.4 1.54-3.6 0.35-5.18l-4.22-5.55Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFF8E3B5"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M20.3 19.87c1.15-1.39 1.21-3.4 0.1-4.85l-4.16-5.48c-1.36-1.79-3.93-2.05-5.61-0.63 0.2 5.55 4.32 10.1 9.68 10.96Zm9.08 10.25l0.33-0.33c1.38-1.38 3.57-1.52 5.12-0.34l5.48 4.16c1.46 1.11 1.9 3.03 1.25 4.6-0.38 0.04-0.76 0.06-1.15 0.06-5.2 0-9.58-3.43-11.03-8.15Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFA48338"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M15.27 10.16c-1.08-1.42-3.17-1.56-4.43-0.3l-0.85 0.85c-2.5 2.51-3.67 6.03-2.58 9.2 1.75 5.1 4.65 9.89 8.72 13.96s8.86 6.97 13.95 8.72c3.18 1.09 6.7-0.07 9.2-2.58l0.86-0.85c1.26-1.26 1.12-3.35-0.3-4.43l-5.56-4.22c-1.17-0.9-2.82-0.78-3.87 0.26L28 33.2c-0.55 0.55-1.3 0.53-1.83 0.43-0.56-0.1-1.17-0.37-1.78-0.7-1.24-0.7-2.7-1.83-4.09-3.22-1.4-1.4-2.52-2.85-3.21-4.09-0.34-0.61-0.6-1.22-0.71-1.78-0.1-0.52-0.12-1.28 0.43-1.83l2.42-2.41c1.04-1.05 1.15-2.7 0.26-3.87l-4.22-5.56ZM9.43 8.45c2.12-2.12 5.62-1.88 7.43 0.5l4.22 5.56c1.5 1.97 1.31 4.74-0.44 6.49l-2.32 2.32 0.02 0.13c0.05 0.27 0.2 0.67 0.5 1.2 0.57 1.03 1.57 2.33 2.88 3.63 1.3 1.3 2.6 2.3 3.64 2.88 0.52 0.3 0.92 0.45 1.2 0.5l0.12 0.02L29 29.36c1.75-1.75 4.52-1.94 6.5-0.44l5.55 4.22c2.38 1.81 2.62 5.31 0.5 7.43l-0.85 0.85c-2.9 2.91-7.2 4.46-11.27 3.06-5.37-1.84-10.42-4.9-14.71-9.2-4.3-4.29-7.36-9.34-9.2-14.71-1.4-4.08 0.15-8.36 3.06-11.27l0.85-0.85Zm17.32 23.23h-0.01Zm-8.43-8.43v0.01Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFD3D3D3"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M29.33 6.96C29.33 4.22 31.43 2 34 2c2.58 0 4.67 2.22 4.67 4.96V9.2c0.45 0.27 0.82 0.67 1.05 1.16 0.16 0.33 0.22 0.68 0.25 1.06C40 11.8 40 12.25 40 12.8v3.3c0 0.54 0 0.99-0.03 1.35-0.03 0.38-0.09 0.74-0.25 1.07-0.25 0.51-0.64 0.93-1.12 1.2-0.32 0.16-0.65 0.23-1 0.26S36.81 20 36.3 20H31.7c-0.51 0-0.94 0-1.28-0.03-0.36-0.03-0.7-0.1-1-0.27-0.49-0.26-0.88-0.68-1.13-1.2-0.16-0.32-0.22-0.68-0.25-1.06C28 17.08 28 16.63 28 16.1v-3.3c0-0.54 0-0.99 0.03-1.36 0.03-0.38 0.1-0.73 0.25-1.06 0.23-0.5 0.6-0.9 1.05-1.16V6.96Zm8 0v1.93l-1.02-0.01H31.7l-1.02 0.01V6.96c0-1.96 1.49-3.54 3.33-3.54S37.33 5 37.33 6.96Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF77736B"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M28.28 10.37c0.2-0.43 0.51-0.79 0.89-1.05l0.16-0.1V6.95C29.33 4.22 31.43 2 34 2c2.58 0 4.67 2.22 4.67 4.96V9.2l0.16 0.11c0.38 0.26 0.68 0.62 0.89 1.05 0.16 0.33 0.22 0.68 0.25 1.06C40 11.8 40 12.25 40 12.8v3.3c0 0.54 0 0.99-0.03 1.35-0.03 0.38-0.09 0.74-0.25 1.07-0.25 0.51-0.64 0.93-1.12 1.2-0.32 0.16-0.65 0.23-1 0.26S36.81 20 36.3 20H31.7c-0.51 0-0.94 0-1.28-0.03-0.36-0.03-0.7-0.1-1-0.27-0.49-0.26-0.88-0.68-1.13-1.2-0.16-0.32-0.22-0.68-0.25-1.06C28 17.08 28 16.63 28 16.1v-3.3c0-0.54 0-0.99 0.03-1.36 0.03-0.38 0.1-0.73 0.25-1.06Zm8.98 0.02l0.48 0.02 0.17 0.1c0.18 0.1 0.35 0.28 0.46 0.5 0.04 0.1 0.08 0.24 0.1 0.54 0.03 0.3 0.03 0.68 0.03 1.24v3.3c0 0.56 0 0.94-0.02 1.24-0.03 0.3-0.07 0.44-0.11 0.53-0.12 0.24-0.3 0.42-0.49 0.52-0.06 0.04-0.16 0.07-0.42 0.1-0.26 0.02-0.61 0.02-1.15 0.02H31.7c-0.54 0-0.89 0-1.15-0.02-0.26-0.03-0.36-0.06-0.42-0.1-0.2-0.1-0.37-0.28-0.49-0.52-0.04-0.1-0.08-0.24-0.1-0.53-0.03-0.3-0.03-0.68-0.03-1.24v-3.3c0-0.56 0-0.94 0.02-1.24 0.03-0.3 0.07-0.44 0.11-0.53 0.11-0.23 0.28-0.4 0.46-0.51l0.17-0.1 0.48-0.02 0.95-0.01h4.62 0.95ZM31 6.88c0-1.92 1.39-3.38 3-3.38s3 1.46 3 3.38v1.6h-0.56-4.88H31v-1.6Z"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="48dp"
|
||||||
|
android:height="48dp"
|
||||||
|
android:viewportWidth="48"
|
||||||
|
android:viewportHeight="48">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M3.08 23.73c-1.15-4.27 1.39-8.66 5.65-9.8L24.2 9.79c4.27-1.15 8.65 1.39 9.8 5.65l4.13 15.46c1.15 4.27-1.39 8.65-5.66 9.8l-15.45 4.14c-4.27 1.14-8.65-1.39-9.8-5.66L3.08 23.73Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF5C8FAB"
|
||||||
|
android:pathData="M8.22 12l15.45-4.15c5.34-1.42 10.82 1.74 12.25 7.08l4.13 15.45c1.43 5.34-1.73 10.82-7.07 12.25l-15.45 4.14C12.19 48.2 6.7 45.03 5.28 39.7L1.14 24.24C-0.28 18.91 2.88 13.43 8.22 12Zm0.51 1.93c-4.26 1.14-6.8 5.53-5.65 9.8L7.2 39.18c1.15 4.27 5.53 6.8 9.8 5.66l15.45-4.14c4.27-1.15 6.8-5.53 5.66-9.8L34 15.44c-1.15-4.26-5.53-6.8-9.8-5.65L8.73 13.93Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:pathData="M7.94 22.57c-0.45-1.68 0.55-3.4 2.23-3.85l15.17-4.07c1.68-0.45 3.4 0.55 3.85 2.23l4.07 15.18c0.45 1.67-0.55 3.4-2.23 3.84l-15.17 4.07c-1.68 0.45-3.4-0.54-3.85-2.22L7.94 22.57Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M14.55 24.28c-0.08-0.3 0.1-0.61 0.4-0.7l0.72-0.19c0.3-0.08 0.6 0.1 0.69 0.4l0.2 0.72c0.07 0.3-0.1 0.61-0.4 0.7l-0.73 0.19c-0.3 0.08-0.6-0.1-0.69-0.4l-0.2-0.72Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M13.65 21.31l2-0.53c0.29-0.08 0.54-0.15 0.75-0.19 0.23-0.04 0.46-0.06 0.71 0 0.37 0.07 0.7 0.27 0.96 0.55 0.17 0.19 0.27 0.4 0.35 0.62 0.07 0.2 0.14 0.45 0.21 0.74l0.54 2c0.07 0.28 0.14 0.53 0.18 0.75 0.04 0.22 0.06 0.46 0 0.7-0.07 0.38-0.26 0.71-0.54 0.96-0.2 0.17-0.4 0.27-0.62 0.35-0.2 0.07-0.46 0.14-0.74 0.22l-2 0.53c-0.29 0.08-0.54 0.15-0.75 0.19-0.23 0.04-0.46 0.06-0.71 0-0.37-0.07-0.7-0.27-0.96-0.55-0.17-0.19-0.27-0.4-0.35-0.62-0.07-0.2-0.14-0.45-0.21-0.74l-0.54-2c-0.08-0.28-0.14-0.53-0.18-0.74-0.04-0.23-0.06-0.47 0-0.72 0.07-0.37 0.26-0.7 0.54-0.95 0.2-0.17 0.4-0.27 0.62-0.35 0.2-0.07 0.46-0.14 0.74-0.22Zm-0.3 1.45c-0.13 0.05-0.17 0.08-0.18 0.1-0.07 0.06-0.13 0.15-0.15 0.24l0.02 0.21 0.16 0.67 0.53 1.95c0.08 0.32 0.14 0.51 0.19 0.66 0.05 0.14 0.08 0.18 0.09 0.19 0.06 0.07 0.15 0.12 0.25 0.14 0.01 0 0.06 0.01 0.2-0.02 0.16-0.02 0.35-0.08 0.67-0.16l1.95-0.52c0.32-0.09 0.52-0.14 0.66-0.2 0.14-0.04 0.18-0.07 0.19-0.08 0.07-0.07 0.12-0.16 0.14-0.25 0-0.02 0.01-0.06-0.01-0.2-0.03-0.16-0.08-0.36-0.17-0.67l-0.52-1.96c-0.08-0.32-0.14-0.51-0.19-0.66-0.05-0.14-0.08-0.17-0.09-0.19-0.07-0.07-0.15-0.12-0.25-0.14-0.01 0-0.06-0.01-0.2 0.02-0.16 0.02-0.36 0.08-0.67 0.16l-1.96 0.52c-0.31 0.09-0.5 0.14-0.66 0.2Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M17.08 31.56c-0.3 0.08-0.48 0.38-0.4 0.68l0.2 0.73c0.07 0.3 0.38 0.48 0.68 0.4l0.73-0.2c0.3-0.08 0.48-0.39 0.4-0.69l-0.2-0.72c-0.08-0.3-0.39-0.48-0.69-0.4l-0.72 0.2Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M15.78 29.28l2-0.53c0.3-0.08 0.54-0.15 0.75-0.19 0.23-0.04 0.47-0.06 0.72 0 0.36 0.07 0.7 0.27 0.95 0.55 0.17 0.19 0.27 0.4 0.35 0.62 0.07 0.2 0.14 0.45 0.22 0.74l0.53 2c0.08 0.28 0.14 0.53 0.18 0.74 0.04 0.23 0.06 0.47 0.01 0.72-0.08 0.37-0.27 0.7-0.55 0.95-0.19 0.17-0.4 0.27-0.62 0.35-0.2 0.07-0.45 0.14-0.74 0.22l-2 0.53c-0.29 0.08-0.54 0.15-0.75 0.19-0.22 0.04-0.46 0.06-0.71 0-0.37-0.07-0.7-0.27-0.95-0.55-0.18-0.19-0.28-0.4-0.35-0.62-0.08-0.2-0.14-0.45-0.22-0.74l-0.54-2c-0.07-0.28-0.14-0.53-0.18-0.75-0.04-0.22-0.06-0.46 0-0.7 0.07-0.38 0.27-0.71 0.54-0.96 0.2-0.17 0.41-0.28 0.63-0.35l0.73-0.22Zm-0.3 1.45c-0.13 0.05-0.17 0.08-0.18 0.1-0.07 0.06-0.12 0.15-0.14 0.24 0 0.02-0.01 0.06 0.01 0.2 0.03 0.16 0.08 0.36 0.17 0.67l0.52 1.96c0.09 0.32 0.14 0.51 0.2 0.66 0.04 0.14 0.07 0.17 0.08 0.19 0.07 0.07 0.15 0.12 0.25 0.14 0.02 0 0.06 0.01 0.2-0.02 0.16-0.02 0.36-0.08 0.67-0.16l1.96-0.52c0.31-0.09 0.51-0.14 0.66-0.2 0.14-0.04 0.17-0.07 0.18-0.08 0.08-0.07 0.13-0.16 0.15-0.25l-0.02-0.21-0.16-0.67-0.53-1.95c-0.08-0.32-0.13-0.51-0.19-0.66-0.05-0.14-0.08-0.18-0.09-0.19-0.06-0.07-0.15-0.12-0.25-0.14-0.01 0-0.06-0.01-0.2 0.01l-0.67 0.17-1.95 0.52c-0.32 0.09-0.52 0.14-0.66 0.2Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M22.91 21.45c-0.3 0.08-0.47 0.39-0.4 0.69l0.2 0.72c0.08 0.3 0.39 0.48 0.69 0.4l0.72-0.2c0.3-0.07 0.48-0.38 0.4-0.68l-0.2-0.72c-0.07-0.3-0.38-0.48-0.68-0.4l-0.73 0.2Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M21.62 19.18c-0.28 0.07-0.54 0.14-0.74 0.21-0.21 0.08-0.43 0.18-0.62 0.35-0.28 0.25-0.47 0.59-0.55 0.96-0.05 0.25-0.03 0.48 0 0.71l0.19 0.75 0.54 2c0.07 0.28 0.14 0.53 0.21 0.74 0.08 0.21 0.18 0.43 0.35 0.62 0.25 0.28 0.59 0.47 0.95 0.55 0.25 0.05 0.5 0.03 0.72 0 0.2-0.05 0.46-0.11 0.74-0.2l2-0.53c0.3-0.07 0.54-0.14 0.74-0.21 0.22-0.08 0.44-0.18 0.63-0.35 0.28-0.25 0.47-0.59 0.55-0.96 0.05-0.25 0.03-0.48-0.01-0.71-0.04-0.21-0.1-0.46-0.18-0.75l-0.54-2c-0.08-0.28-0.14-0.53-0.21-0.74-0.08-0.21-0.18-0.43-0.35-0.62-0.26-0.28-0.59-0.47-0.96-0.55-0.25-0.05-0.49-0.03-0.71 0-0.21 0.05-0.46 0.11-0.75 0.2l-2 0.53Zm-0.48 1.54c0-0.01 0.04-0.04 0.18-0.1l0.66-0.18 1.96-0.52 0.66-0.17c0.15-0.03 0.2-0.02 0.2-0.02 0.1 0.03 0.2 0.08 0.26 0.15 0 0.01 0.04 0.05 0.09 0.19l0.19 0.65 0.52 1.96c0.09 0.31 0.14 0.51 0.17 0.67 0.02 0.14 0.02 0.19 0.01 0.2-0.02 0.1-0.07 0.19-0.14 0.25-0.01 0.01-0.05 0.04-0.19 0.1l-0.66 0.18-1.95 0.53-0.67 0.16c-0.14 0.03-0.19 0.02-0.2 0.02-0.1-0.03-0.19-0.08-0.25-0.15-0.01-0.01-0.04-0.05-0.1-0.19L21.7 23.8l-0.53-1.96-0.16-0.67c-0.03-0.14-0.02-0.19-0.02-0.2 0.02-0.1 0.07-0.19 0.15-0.25Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M22.52 27.96c-0.3 0.08-0.48 0.4-0.4 0.7l0.2 0.72c0.08 0.3 0.39 0.47 0.69 0.4l0.72-0.2c0.3-0.08 0.48-0.39 0.4-0.69l-0.2-0.72c-0.08-0.3-0.38-0.48-0.68-0.4l-0.73 0.2Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M24.65 30.11c-0.08-0.3 0.1-0.6 0.4-0.69l0.72-0.2c0.3-0.07 0.61 0.1 0.69 0.4l0.2 0.73c0.07 0.3-0.1 0.6-0.4 0.69l-0.73 0.2c-0.3 0.07-0.6-0.1-0.69-0.4l-0.2-0.73Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M27.17 31.57c-0.08-0.3 0.1-0.61 0.4-0.7l0.73-0.18c0.3-0.09 0.6 0.1 0.69 0.4l0.19 0.72c0.08 0.3-0.1 0.6-0.4 0.69l-0.72 0.2c-0.3 0.07-0.61-0.1-0.7-0.4l-0.19-0.73Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M26.5 26.9c-0.3 0.08-0.47 0.38-0.4 0.68l0.2 0.73c0.08 0.3 0.4 0.48 0.7 0.4l0.72-0.2c0.3-0.08 0.47-0.39 0.4-0.69l-0.2-0.72c-0.08-0.3-0.39-0.48-0.69-0.4l-0.72 0.2Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF8AB8D1"
|
||||||
|
android:pathData="M23.19 32.64c-0.08-0.3 0.1-0.61 0.4-0.7l0.72-0.19c0.3-0.08 0.61 0.1 0.7 0.4l0.19 0.73c0.08 0.3-0.1 0.6-0.4 0.68l-0.73 0.2c-0.3 0.08-0.6-0.1-0.69-0.4l-0.19-0.72Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF88A5E4"
|
||||||
|
android:pathData="M14 10c0-4.42 3.59-8 8-8h16c4.42 0 8 3.58 8 8v16c0 4.42-3.58 8-8 8H22c-4.42 0-8-3.58-8-8V10Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M22 0h16c5.53 0 10 4.48 10 10v16c0 5.52-4.48 10-10 10H22c-5.52 0-10-4.48-10-10V10c0-5.52 4.48-10 10-10Zm0 2c-4.41 0-8 3.58-8 8v16c0 4.42 3.58 8 8 8h16c4.42 0 8-3.58 8-8V10c0-4.42-3.58-8-8-8H22Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:pathData="M19 10.14C19 8.41 20.42 7 22.16 7h15.71c1.74 0 3.15 1.4 3.15 3.14v15.72C41 27.59 39.6 29 37.85 29H22.14C20.41 29 19 27.6 19 25.86V10.14Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M24.94 13.5c0-0.31 0.26-0.56 0.57-0.56h0.75c0.3 0 0.56 0.25 0.56 0.56v0.75c0 0.31-0.25 0.56-0.56 0.56H25.5c-0.32 0-0.57-0.25-0.57-0.56V13.5Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M24.84 10.4h2.08c0.3 0 0.55 0 0.77 0.02 0.22 0.02 0.46 0.06 0.69 0.18 0.33 0.17 0.6 0.44 0.78 0.78 0.11 0.23 0.15 0.46 0.17 0.69 0.02 0.21 0.02 0.47 0.02 0.77v2.07c0 0.3 0 0.56-0.02 0.77-0.02 0.23-0.06 0.46-0.18 0.7-0.17 0.33-0.44 0.6-0.77 0.77-0.23 0.12-0.47 0.16-0.7 0.18l-0.76 0.01h-2.08l-0.77-0.01c-0.22-0.02-0.46-0.06-0.69-0.18-0.33-0.17-0.6-0.44-0.77-0.78-0.12-0.23-0.16-0.46-0.18-0.69-0.02-0.21-0.02-0.47-0.02-0.77v-2.07c0-0.3 0-0.56 0.02-0.77 0.02-0.23 0.06-0.46 0.18-0.7 0.17-0.33 0.44-0.6 0.78-0.77 0.22-0.12 0.46-0.16 0.69-0.18l0.76-0.01Zm-0.66 1.33c-0.14 0.01-0.19 0.03-0.2 0.04-0.09 0.04-0.16 0.12-0.2 0.2-0.01 0.02-0.03 0.06-0.04 0.2l-0.02 0.7v2.02c0 0.32 0 0.53 0.02 0.68 0 0.15 0.03 0.2 0.04 0.2 0.04 0.1 0.11 0.17 0.2 0.21 0.01 0 0.06 0.03 0.2 0.04l0.69 0.01h2.02l0.69-0.01c0.15-0.01 0.19-0.03 0.2-0.04 0.09-0.04 0.16-0.12 0.2-0.2 0.01-0.02 0.03-0.06 0.04-0.2 0.02-0.16 0.02-0.37 0.02-0.7v-2.02c0-0.32 0-0.53-0.02-0.68 0-0.15-0.03-0.2-0.03-0.2-0.05-0.1-0.12-0.17-0.2-0.21-0.02 0-0.06-0.03-0.21-0.04l-0.69-0.01h-2.02l-0.69 0.01Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M25.5 21.19c-0.3 0-0.56 0.25-0.56 0.56v0.75c0 0.31 0.25 0.56 0.56 0.56h0.75c0.31 0 0.57-0.25 0.57-0.56v-0.75c0-0.31-0.26-0.56-0.57-0.56H25.5Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M24.84 18.66h2.08l0.76 0.01c0.23 0.02 0.47 0.06 0.7 0.18 0.33 0.17 0.6 0.44 0.77 0.78 0.12 0.23 0.16 0.46 0.18 0.69 0.02 0.21 0.02 0.47 0.02 0.77v2.07c0 0.3 0 0.56-0.02 0.77-0.02 0.23-0.06 0.46-0.18 0.7-0.17 0.33-0.44 0.6-0.78 0.77-0.22 0.12-0.46 0.16-0.69 0.18l-0.76 0.01h-2.08l-0.77-0.01c-0.22-0.02-0.46-0.06-0.69-0.18-0.33-0.17-0.6-0.44-0.78-0.78-0.11-0.23-0.15-0.46-0.17-0.69-0.02-0.21-0.02-0.47-0.02-0.77V21.1c0-0.3 0-0.56 0.02-0.77 0.02-0.23 0.06-0.46 0.17-0.7 0.18-0.33 0.45-0.6 0.78-0.77 0.23-0.12 0.47-0.16 0.7-0.18l0.76-0.01Zm-0.66 1.32c-0.15 0.01-0.19 0.03-0.2 0.04-0.09 0.04-0.16 0.12-0.2 0.2-0.01 0.02-0.03 0.06-0.04 0.2-0.02 0.16-0.02 0.37-0.02 0.7v2.02c0 0.32 0 0.53 0.02 0.68 0 0.15 0.03 0.2 0.03 0.2 0.05 0.1 0.12 0.17 0.2 0.21 0.02 0 0.06 0.03 0.21 0.04l0.69 0.01h2.02l0.69-0.01c0.14-0.01 0.19-0.03 0.2-0.04 0.09-0.04 0.16-0.12 0.2-0.2 0.01-0.02 0.03-0.06 0.04-0.2l0.01-0.7v-2.02-0.68c-0.02-0.15-0.04-0.2-0.05-0.2-0.04-0.1-0.11-0.17-0.2-0.21-0.01 0-0.06-0.03-0.2-0.04l-0.69-0.01h-2.02l-0.69 0.01Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M33.76 12.94c-0.31 0-0.57 0.25-0.57 0.56v0.75c0 0.31 0.25 0.56 0.57 0.56h0.75c0.3 0 0.56-0.25 0.56-0.56V13.5c0-0.31-0.25-0.56-0.56-0.56h-0.75Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M33.1 10.4c-0.3 0-0.56 0-0.77 0.02-0.23 0.02-0.47 0.06-0.7 0.18-0.33 0.17-0.6 0.44-0.77 0.78-0.12 0.23-0.16 0.46-0.18 0.69-0.02 0.21-0.02 0.47-0.02 0.77v2.07c0 0.3 0 0.56 0.02 0.77 0.02 0.23 0.06 0.46 0.18 0.7 0.17 0.33 0.44 0.6 0.77 0.77 0.23 0.12 0.47 0.16 0.7 0.18l0.76 0.01h2.08l0.76-0.01c0.23-0.02 0.47-0.06 0.7-0.18 0.33-0.17 0.6-0.44 0.77-0.78 0.12-0.23 0.16-0.46 0.18-0.69 0.02-0.21 0.02-0.47 0.02-0.77v-2.07c0-0.3 0-0.56-0.02-0.77-0.02-0.23-0.06-0.46-0.17-0.7-0.17-0.33-0.45-0.6-0.78-0.77-0.23-0.12-0.47-0.16-0.7-0.18l-0.76-0.01h-2.08Zm-0.87 1.37c0.01 0 0.06-0.03 0.2-0.04l0.69-0.01h2.02l0.69 0.01c0.15 0.01 0.19 0.03 0.2 0.04 0.09 0.04 0.16 0.12 0.2 0.2 0.01 0.02 0.03 0.06 0.04 0.2 0.02 0.16 0.02 0.37 0.02 0.7v2.02c0 0.32 0 0.53-0.02 0.68 0 0.15-0.03 0.2-0.03 0.2-0.05 0.1-0.12 0.17-0.2 0.21-0.02 0-0.06 0.03-0.21 0.04l-0.69 0.01h-2.02l-0.69-0.01c-0.14-0.01-0.19-0.03-0.2-0.04-0.09-0.04-0.16-0.12-0.2-0.2-0.01-0.02-0.03-0.06-0.04-0.2-0.02-0.16-0.02-0.37-0.02-0.7v-2.02c0-0.32 0-0.53 0.02-0.68 0.01-0.15 0.03-0.2 0.04-0.2 0.04-0.1 0.11-0.17 0.2-0.21Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M31.7 19.13c-0.32 0-0.57 0.25-0.57 0.56v0.75c0 0.3 0.25 0.56 0.56 0.56h0.75c0.31 0 0.56-0.25 0.56-0.56v-0.75c0-0.31-0.25-0.57-0.56-0.57H31.7Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M33.2 21.75c0-0.31 0.24-0.56 0.55-0.56h0.75c0.31 0 0.57 0.25 0.57 0.56v0.75c0 0.31-0.26 0.56-0.57 0.56h-0.75c-0.3 0-0.56-0.25-0.56-0.56v-0.75Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M35.25 23.81c0-0.3 0.26-0.56 0.57-0.56h0.75c0.3 0 0.56 0.25 0.56 0.56v0.75c0 0.31-0.25 0.57-0.56 0.57h-0.75c-0.31 0-0.57-0.26-0.57-0.57v-0.75Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M35.82 19.13c-0.31 0-0.57 0.25-0.57 0.56v0.75c0 0.3 0.26 0.56 0.57 0.56h0.75c0.3 0 0.56-0.25 0.56-0.56v-0.75c0-0.31-0.25-0.57-0.56-0.57h-0.75Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6384CB"
|
||||||
|
android:pathData="M31.13 23.81c0-0.3 0.25-0.56 0.56-0.56h0.75c0.31 0 0.56 0.25 0.56 0.56v0.75c0 0.31-0.25 0.57-0.56 0.57H31.7c-0.31 0-0.56-0.26-0.56-0.57v-0.75Z"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="48dp"
|
||||||
|
android:height="48dp"
|
||||||
|
android:viewportWidth="48"
|
||||||
|
android:viewportHeight="48">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFADB4F1"
|
||||||
|
android:pathData="M48 24C48 10.75 37.25 0 24 0S0 10.75 0 24s10.75 24 24 24 24-10.75 24-24Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6A73C0"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M24 46C11.85 46 2 36.15 2 24S11.85 2 24 2s22 9.85 22 22-9.85 22-22 22Zm0 2c13.25 0 24-10.75 24-24S37.25 0 24 0 0 10.75 0 24s10.75 24 24 24Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M12 24c0-6.63 5.37-12 12-12s12 5.37 12 12c0 1.84-0.39 3.03-0.88 3.73-0.46 0.65-1.05 0.94-1.79 0.94-0.87 0-2-0.97-2-2.34V24c0-4.05-3.28-7.33-7.33-7.33-4.05 0-7.33 3.28-7.33 7.33 0 4.05 3.28 7.33 7.33 7.33 2.14 0 4.06-0.91 5.4-2.37 0.84 1.4 2.31 2.37 3.93 2.37 1.6 0 3-0.7 3.97-2.06 0.92-1.3 1.37-3.1 1.37-5.27 0-8.1-6.57-14.67-14.67-14.67S9.33 15.9 9.33 24 15.9 38.67 24 38.67c2.67 0 5.18-0.72 7.33-1.97 0.64-0.37 0.86-1.18 0.5-1.82-0.38-0.64-1.2-0.85-1.83-0.48-1.76 1.02-3.81 1.6-6 1.6-6.63 0-12-5.37-12-12Zm16.67 0c0 2.58-2.1 4.67-4.67 4.67-2.58 0-4.67-2.1-4.67-4.67 0-2.58 2.1-4.67 4.67-4.67 2.58 0 4.67 2.1 4.67 4.67Z"/>
|
||||||
|
</vector>
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="64dp"
|
|
||||||
android:height="64dp"
|
|
||||||
android:viewportWidth="64"
|
|
||||||
android:viewportHeight="64">
|
|
||||||
<path
|
|
||||||
android:pathData="M28,28m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
|
|
||||||
android:fillColor="#EDF0F6"/>
|
|
||||||
<path
|
|
||||||
android:pathData="M19,28C19,23.029 23.029,19 28,19C32.971,19 37,23.029 37,28C37,29.379 36.71,30.275 36.34,30.797C35.997,31.281 35.552,31.5 35,31.5C34.344,31.5 33.5,30.779 33.5,29.75V28C33.5,24.962 31.038,22.5 28,22.5C24.962,22.5 22.5,24.962 22.5,28C22.5,31.038 24.962,33.5 28,33.5C29.603,33.5 31.045,32.814 32.05,31.721C32.681,32.775 33.786,33.5 35,33.5C36.198,33.5 37.253,32.969 37.972,31.953C38.665,30.975 39,29.621 39,28C39,21.925 34.075,17 28,17C21.925,17 17,21.925 17,28C17,34.075 21.925,39 28,39C30.002,39 31.882,38.464 33.501,37.528C33.979,37.251 34.142,36.639 33.866,36.161C33.589,35.683 32.977,35.52 32.499,35.797C31.177,36.562 29.641,37 28,37C23.029,37 19,32.971 19,28ZM31.5,28C31.5,26.067 29.933,24.5 28,24.5C26.067,24.5 24.5,26.067 24.5,28C24.5,29.933 26.067,31.5 28,31.5C29.933,31.5 31.5,29.933 31.5,28Z"
|
|
||||||
android:fillColor="#000000"
|
|
||||||
android:fillType="evenOdd"/>
|
|
||||||
<path
|
|
||||||
android:pathData="M53.806,34.583C53.944,33.953 53.545,33.331 52.916,33.194C52.286,33.056 51.665,33.455 51.527,34.084L50.415,39.167L44.137,39.167L45.14,34.583C45.277,33.953 44.879,33.331 44.249,33.194C43.62,33.056 42.998,33.455 42.86,34.084L41.748,39.167H37.333C36.689,39.167 36.167,39.689 36.167,40.333C36.167,40.978 36.689,41.5 37.333,41.5H41.238L39.707,48.5H35.333C34.689,48.5 34.167,49.022 34.167,49.667C34.167,50.311 34.689,50.833 35.333,50.833H39.196L38.194,55.417C38.056,56.047 38.455,56.669 39.084,56.806C39.714,56.944 40.335,56.546 40.473,55.916L41.585,50.833H47.863L46.86,55.417C46.722,56.047 47.121,56.669 47.751,56.806C48.38,56.944 49.002,56.546 49.14,55.916L50.251,50.833H54.667C55.311,50.833 55.833,50.311 55.833,49.667C55.833,49.022 55.311,48.5 54.667,48.5H50.762L52.293,41.5H56.667C57.311,41.5 57.833,40.978 57.833,40.333C57.833,39.689 57.311,39.167 56.667,39.167H52.804L53.806,34.583ZM49.905,41.5H43.626L42.095,48.5H48.373L49.905,41.5Z"
|
|
||||||
android:fillColor="#CCD1FF"
|
|
||||||
android:fillType="evenOdd"/>
|
|
||||||
<path
|
|
||||||
android:pathData="M38.764,58.272C37.325,57.957 36.414,56.536 36.728,55.097L37.333,52.333H35.333C33.861,52.333 32.667,51.139 32.667,49.667C32.667,48.194 33.861,47 35.333,47H38.499L39.374,43H37.333C35.861,43 34.667,41.806 34.667,40.333C34.667,38.861 35.861,37.667 37.333,37.667H40.541L41.395,33.764C41.71,32.325 43.131,31.414 44.57,31.728C46.009,32.043 46.92,33.465 46.605,34.903L46,37.667L49.208,37.667L50.062,33.764C50.376,32.325 51.798,31.414 53.236,31.728C54.675,32.043 55.586,33.465 55.272,34.903L54.667,37.667H56.667C58.139,37.667 59.333,38.861 59.333,40.333C59.333,41.806 58.139,43 56.667,43H53.5L52.625,47H54.667C56.139,47 57.333,48.194 57.333,49.667C57.333,51.139 56.139,52.333 54.667,52.333H51.459L50.605,56.237C50.29,57.675 48.869,58.586 47.43,58.272C45.991,57.957 45.08,56.536 45.395,55.097L45.999,52.333H42.792L41.938,56.237C41.624,57.675 40.202,58.586 38.764,58.272ZM38.194,55.417C38.056,56.047 38.455,56.669 39.084,56.806C39.714,56.944 40.335,56.546 40.473,55.916L41.585,50.833H47.863L46.86,55.417C46.722,56.047 47.121,56.669 47.751,56.806C48.38,56.944 49.002,56.546 49.14,55.916L50.251,50.833H54.667C55.311,50.833 55.833,50.311 55.833,49.667C55.833,49.022 55.311,48.5 54.667,48.5H50.762L52.293,41.5H56.667C57.311,41.5 57.833,40.978 57.833,40.333C57.833,39.689 57.311,39.167 56.667,39.167H52.804L53.806,34.583C53.944,33.953 53.545,33.331 52.916,33.194C52.286,33.056 51.665,33.455 51.527,34.084L50.415,39.167L44.137,39.167L45.14,34.583C45.277,33.953 44.879,33.331 44.249,33.194C43.62,33.056 42.998,33.455 42.86,34.084L41.748,39.167H37.333C36.689,39.167 36.167,39.689 36.167,40.333C36.167,40.978 36.689,41.5 37.333,41.5H41.238L39.707,48.5H35.333C34.689,48.5 34.167,49.022 34.167,49.667C34.167,50.311 34.689,50.833 35.333,50.833H39.196L38.194,55.417ZM44.834,43L43.959,47H47.166L48.041,43H44.834ZM43.626,41.5L42.095,48.5H48.373L49.905,41.5H43.626Z"
|
|
||||||
android:fillColor="#6771CC"
|
|
||||||
android:fillType="evenOdd"/>
|
|
||||||
</vector>
|
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="56dp"
|
||||||
|
android:height="56dp"
|
||||||
|
android:viewportWidth="56"
|
||||||
|
android:viewportHeight="56">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFADB4F1"
|
||||||
|
android:pathData="M52 28c0 13.25-10.75 24-24 24S4 41.25 4 28 14.75 4 28 4s24 10.75 24 24Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF6A73C0"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M28 50c12.15 0 22-9.85 22-22S40.15 6 28 6 6 15.85 6 28s9.85 22 22 22Zm0 2c13.25 0 24-10.75 24-24S41.25 4 28 4 4 14.75 4 28s10.75 24 24 24Z"/>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M16 28c0-6.63 5.37-12 12-12s12 5.37 12 12c0 1.84-0.39 3.03-0.88 3.73-0.46 0.65-1.05 0.94-1.79 0.94-0.87 0-2-0.97-2-2.34V28c0-4.05-3.28-7.33-7.33-7.33-4.05 0-7.33 3.28-7.33 7.33 0 4.05 3.28 7.33 7.33 7.33 2.14 0 4.06-0.91 5.4-2.37 0.84 1.4 2.31 2.37 3.93 2.37 1.6 0 3-0.7 3.97-2.06 0.92-1.3 1.37-3.1 1.37-5.27 0-8.1-6.57-14.67-14.67-14.67S13.33 19.9 13.33 28 19.9 42.67 28 42.67c2.67 0 5.18-0.72 7.33-1.97 0.64-0.37 0.86-1.18 0.5-1.82-0.38-0.64-1.2-0.85-1.83-0.48-1.76 1.02-3.81 1.6-6 1.6-6.63 0-12-5.37-12-12Zm16.67 0c0-2.58-2.1-4.67-4.67-4.67-2.58 0-4.67 2.1-4.67 4.67 0 2.58 2.1 4.67 4.67 4.67 2.58 0 4.67-2.1 4.67-4.67Z"/>
|
||||||
|
</vector>
|
||||||
@@ -2427,6 +2427,26 @@
|
|||||||
<!-- Notification subtext for group stories -->
|
<!-- Notification subtext for group stories -->
|
||||||
<string name="SingleRecipientNotificationBuilder__s_dot_story">%1$s • Story</string>
|
<string name="SingleRecipientNotificationBuilder__s_dot_story">%1$s • Story</string>
|
||||||
|
|
||||||
|
<!-- NewWaysToConnectDialogFragment -->
|
||||||
|
<!-- Fragment title, displayed at the top of the content -->
|
||||||
|
<string name="NewWaysToConnectDialogFragment__new_ways_to_connect">New ways to connect</string>
|
||||||
|
<!-- Row item title for phone number privacy explainer -->
|
||||||
|
<string name="NewWaysToConnectDialogFragment__phone_number_privacy">Phone number privacy</string>
|
||||||
|
<!-- Row item description for phone number privacy explainer -->
|
||||||
|
<string name="NewWaysToConnectDialogFragment__your_phone_number_is_no_longer_shared">Your phone number is no longer shared with chats. If your number is saved to a friend\'s contacts, they will still see it.</string>
|
||||||
|
<!-- Row item title for usernames explainer -->
|
||||||
|
<string name="NewWaysToConnectDialogFragment__usernames">Usernames</string>
|
||||||
|
<!-- Row item description for usernames explainer -->
|
||||||
|
<string name="NewWaysToConnectDialogFragment__people_can_now_message_you_using_your_optional_username">People can now message you using your optional username so you don\'t have to give out your phone number. Usernames aren\'t visible on your profile.</string>
|
||||||
|
<!-- Row item title for qr code and links explainer -->
|
||||||
|
<string name="NewWaysToConnectDialogFragment__qr_codes_and_links">QR codes and links</string>
|
||||||
|
<!-- Row item description for qr code and links explainer -->
|
||||||
|
<string name="NewWaysToConnectDialogFragment__usernames_have_a_unique_qr_code">Usernames have a unique QR code and link you can share with friends to quickly start a chat with you.</string>
|
||||||
|
<!-- Button label for not right now -->
|
||||||
|
<string name="NewWaysToConnectDialogFragment__not_now">Not now</string>
|
||||||
|
<!-- Button label for continue -->
|
||||||
|
<string name="NewWaysToConnectDialogFragment__set_up_your_username">Set up your username</string>
|
||||||
|
|
||||||
<!-- ThumbnailView -->
|
<!-- ThumbnailView -->
|
||||||
<string name="ThumbnailView_Play_video_description">Play video</string>
|
<string name="ThumbnailView_Play_video_description">Play video</string>
|
||||||
<string name="ThumbnailView_Has_a_caption_description">Has a caption</string>
|
<string name="ThumbnailView_Has_a_caption_description">Has a caption</string>
|
||||||
@@ -6213,11 +6233,11 @@
|
|||||||
<!-- Displayed as a title on a megaphone which prompts user to set up a username -->
|
<!-- Displayed as a title on a megaphone which prompts user to set up a username -->
|
||||||
<string name="SetUpYourUsername__set_up_your_signal_username">Set up your Signal username</string>
|
<string name="SetUpYourUsername__set_up_your_signal_username">Set up your Signal username</string>
|
||||||
<!-- Displayed as a description on a megaphone which prompts user to set up a username -->
|
<!-- Displayed as a description on a megaphone which prompts user to set up a username -->
|
||||||
<string name="SetUpYourUsername__usernames_let_others">Usernames let others message you without needing your phone number</string>
|
<string name="SetUpYourUsername__introducing_phone_number_privacy">Introducing phone number privacy, optional usernames and links.</string>
|
||||||
<!-- Displayed as an action on a megaphone which prompts user to set up a username -->
|
<!-- Displayed as an action on a megaphone which prompts user to set up a username -->
|
||||||
<string name="SetUpYourUsername__not_now">Not now</string>
|
<string name="SetUpYourUsername__dismiss">Dismiss</string>
|
||||||
<!-- Displayed as an action on a megaphone which prompts user to set up a username -->
|
<!-- Displayed as an action on a megaphone which prompts user to set up a username -->
|
||||||
<string name="SetUpYourUsername__continue">Continue</string>
|
<string name="SetUpYourUsername__learn_more">Learn more</string>
|
||||||
|
|
||||||
<!-- Text Formatting -->
|
<!-- Text Formatting -->
|
||||||
<!-- Popup menu label for applying bold style -->
|
<!-- Popup menu label for applying bold style -->
|
||||||
@@ -6562,6 +6582,8 @@
|
|||||||
<string name="GrantFullScreenIntentPermission_megaphone_body">Never miss a call from your contacts and groups.</string>
|
<string name="GrantFullScreenIntentPermission_megaphone_body">Never miss a call from your contacts and groups.</string>
|
||||||
<!-- Button on the megaphone megaphone shown at the bottom of the chat list when a user has disable the system setting for showing full screen notifications used showing incoming calls that starts the fix process -->
|
<!-- Button on the megaphone megaphone shown at the bottom of the chat list when a user has disable the system setting for showing full screen notifications used showing incoming calls that starts the fix process -->
|
||||||
<string name="GrantFullScreenIntentPermission_megaphone_turn_on">Turn on</string>
|
<string name="GrantFullScreenIntentPermission_megaphone_turn_on">Turn on</string>
|
||||||
|
<!-- Button on the megaphone shown at the bottom of the chatlist when a user has disabled the system setting for showing full screen notifications used showing incoming calls that dismisses the megaphone -->
|
||||||
|
<string name="GrantFullScreenIntentPermission_megaphone_not_now">Not now</string>
|
||||||
<!-- Title of bottom sheet shown after tapping "Turn on" from the megaphone to re-enable full screen notifications for incoming call notifications -->
|
<!-- Title of bottom sheet shown after tapping "Turn on" from the megaphone to re-enable full screen notifications for incoming call notifications -->
|
||||||
<string name="GrantFullScreenIntentPermission_bottomsheet_title">Turn on full screen notifications</string>
|
<string name="GrantFullScreenIntentPermission_bottomsheet_title">Turn on full screen notifications</string>
|
||||||
<!-- Subtitle of bottom sheet shown after tapping "Turn on" from the megaphone to re-enable full screen notifications for incoming call notifications -->
|
<!-- Subtitle of bottom sheet shown after tapping "Turn on" from the megaphone to re-enable full screen notifications for incoming call notifications -->
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2024 Signal Messenger, LLC
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.signal.core.ui
|
||||||
|
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import org.signal.core.ui.theme.SignalTheme
|
||||||
|
|
||||||
|
object Previews {
|
||||||
|
@Composable
|
||||||
|
fun Preview(
|
||||||
|
content: @Composable () -> Unit
|
||||||
|
) {
|
||||||
|
SignalTheme {
|
||||||
|
Surface {
|
||||||
|
content()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user