mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-09-20 00:35:47 +01:00
Update various icons.
This commit is contained in:
Greyson Parrelli
committed by
Alex Hart
Alex Hart
parent
c5271a6dae
commit
515197367e
@@ -46,10 +46,10 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
|
||||
}
|
||||
|
||||
private void initialize() {
|
||||
this.emojiToggle = ContextUtil.requireDrawable(getContext(), R.drawable.ic_emoji);
|
||||
this.stickerToggle = ContextUtil.requireDrawable(getContext(), R.drawable.ic_sticker_24);
|
||||
this.gifToggle = ContextUtil.requireDrawable(getContext(), R.drawable.ic_gif_24);
|
||||
this.imeToggle = ContextUtil.requireDrawable(getContext(), R.drawable.ic_keyboard_24);
|
||||
this.emojiToggle = ContextUtil.requireDrawable(getContext(), R.drawable.symbol_emoji_24);
|
||||
this.stickerToggle = ContextUtil.requireDrawable(getContext(), org.signal.core.ui.R.drawable.symbol_sticker_24);
|
||||
this.gifToggle = ContextUtil.requireDrawable(getContext(), R.drawable.symbol_gif_24);
|
||||
this.imeToggle = ContextUtil.requireDrawable(getContext(), R.drawable.symbol_keyboard_24);
|
||||
this.mediaToggle = emojiToggle;
|
||||
|
||||
setToMedia();
|
||||
|
||||
+6
-6
@@ -36,6 +36,7 @@ import org.signal.core.ui.compose.Dialogs
|
||||
import org.signal.core.ui.compose.Dividers
|
||||
import org.signal.core.ui.compose.Previews
|
||||
import org.signal.core.ui.compose.Rows
|
||||
import org.signal.core.ui.compose.SignalIcons
|
||||
import org.signal.core.ui.compose.Texts
|
||||
import org.signal.emoji.EmojiText
|
||||
import org.thoughtcrime.securesms.R
|
||||
@@ -236,7 +237,7 @@ private fun LazyListScope.membershipSection(
|
||||
item {
|
||||
LargeIconRow(
|
||||
text = stringResource(R.string.ConversationSettingsFragment__add_members),
|
||||
icon = R.drawable.ic_plus_24,
|
||||
icon = CoreUiR.drawable.symbol_plus_24,
|
||||
onClick = { onEvent(GroupSettingsEvent.AddMembersClicked) }
|
||||
)
|
||||
}
|
||||
@@ -263,7 +264,7 @@ private fun LazyListScope.membershipSection(
|
||||
item {
|
||||
LargeIconRow(
|
||||
text = stringResource(R.string.ConversationSettingsFragment__see_all),
|
||||
icon = R.drawable.ic_chevron_down_icon_20,
|
||||
icon = R.drawable.symbol_chevron_down_24,
|
||||
onClick = { onEvent(GroupSettingsEvent.RevealAllMembersClicked) }
|
||||
)
|
||||
}
|
||||
@@ -282,7 +283,7 @@ private fun LazyListScope.managementSection(
|
||||
Rows.TextRow(
|
||||
text = stringResource(R.string.ConversationSettingsFragment__group_link),
|
||||
label = stringResource(if (state.groupLinkEnabled) R.string.preferences_on else R.string.preferences_off),
|
||||
icon = painterResource(R.drawable.ic_link_24),
|
||||
icon = SignalIcons.Link.painter,
|
||||
enabled = state.isActive && !state.isDeprecatedOrUnregistered,
|
||||
onClick = { onEvent(GroupSettingsEvent.GroupLinkClicked) }
|
||||
)
|
||||
@@ -301,8 +302,7 @@ private fun LazyListScope.managementSection(
|
||||
item {
|
||||
Rows.TextRow(
|
||||
text = stringResource(R.string.ConversationSettingsFragment__requests_and_invites),
|
||||
icon = painterResource(R.drawable.ic_update_group_add_16),
|
||||
iconModifier = Modifier.size(24.dp),
|
||||
icon = SignalIcons.Group.painter,
|
||||
enabled = state.isActive && !state.isDeprecatedOrUnregistered,
|
||||
onClick = { onEvent(GroupSettingsEvent.RequestsAndInvitesClicked) }
|
||||
)
|
||||
@@ -312,7 +312,7 @@ private fun LazyListScope.managementSection(
|
||||
item {
|
||||
Rows.TextRow(
|
||||
text = stringResource(R.string.ConversationSettingsFragment__permissions),
|
||||
icon = painterResource(R.drawable.ic_lock_24),
|
||||
icon = SignalIcons.Lock.painter,
|
||||
enabled = state.isActive && !state.isDeprecatedOrUnregistered,
|
||||
onClick = { onEvent(GroupSettingsEvent.PermissionsClicked) }
|
||||
)
|
||||
|
||||
+4
-3
@@ -12,6 +12,7 @@ import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
|
||||
import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
|
||||
import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
|
||||
import org.thoughtcrime.securesms.util.visible
|
||||
import org.signal.core.ui.R as CoreUiR
|
||||
|
||||
/**
|
||||
* Renders a configurable strip of buttons
|
||||
@@ -69,17 +70,17 @@ object ButtonStripPreference {
|
||||
|
||||
if (model.state.isAudioSecure) {
|
||||
audioLabel.setText(R.string.ConversationSettingsFragment__audio)
|
||||
audioCall.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_phone_right_24))
|
||||
audioCall.setImageDrawable(AppCompatResources.getDrawable(context, CoreUiR.drawable.symbol_phone_24))
|
||||
} else {
|
||||
audioLabel.setText(R.string.ConversationSettingsFragment__call)
|
||||
audioCall.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_phone_right_unlock_primary_accent_24))
|
||||
}
|
||||
|
||||
if (model.state.isMuted) {
|
||||
mute.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_bell_disabled_24))
|
||||
mute.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.symbol_bell_slash_24))
|
||||
muteLabel.setText(R.string.ConversationSettingsFragment__muted)
|
||||
} else {
|
||||
mute.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_bell_24))
|
||||
mute.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.symbol_bell_24))
|
||||
muteLabel.setText(R.string.ConversationSettingsFragment__mute)
|
||||
}
|
||||
|
||||
|
||||
+22
-21
@@ -5,7 +5,6 @@
|
||||
|
||||
package org.thoughtcrime.securesms.components.settings.conversation.shared
|
||||
|
||||
import androidx.annotation.DrawableRes
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
@@ -17,11 +16,13 @@ import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import org.signal.core.ui.compose.Buttons
|
||||
import org.signal.core.ui.compose.DayNightPreviews
|
||||
import org.signal.core.ui.compose.DropdownMenus
|
||||
import org.signal.core.ui.compose.Previews
|
||||
import org.signal.core.ui.compose.SignalIcons
|
||||
import org.thoughtcrime.securesms.R
|
||||
import kotlin.time.Duration.Companion.days
|
||||
import kotlin.time.Duration.Companion.hours
|
||||
@@ -72,8 +73,8 @@ fun CallBar(
|
||||
if (state.isAddToStoryAvailable) {
|
||||
Buttons.ActionButton(
|
||||
onClick = onAddToStoryClick,
|
||||
iconResId = R.drawable.add_to_story_24,
|
||||
labelResId = R.string.ConversationSettingsFragment__story,
|
||||
imageVector = SignalIcons.AddToStory.imageVector,
|
||||
label = stringResource(R.string.ConversationSettingsFragment__story),
|
||||
enabled = enabled
|
||||
)
|
||||
}
|
||||
@@ -81,8 +82,8 @@ fun CallBar(
|
||||
if (state.isMessageAvailable) {
|
||||
Buttons.ActionButton(
|
||||
onClick = onMessageClick,
|
||||
iconResId = R.drawable.ic_chat_message_24,
|
||||
labelResId = R.string.ConversationSettingsFragment__message,
|
||||
imageVector = SignalIcons.ChatMessage.imageVector,
|
||||
label = stringResource(R.string.ConversationSettingsFragment__message),
|
||||
enabled = enabled
|
||||
)
|
||||
}
|
||||
@@ -90,8 +91,8 @@ fun CallBar(
|
||||
if (state.isVideoAvailable) {
|
||||
Buttons.ActionButton(
|
||||
onClick = onVideoCallClick,
|
||||
iconResId = R.drawable.ic_video_call_24,
|
||||
labelResId = R.string.ConversationSettingsFragment__video,
|
||||
imageVector = SignalIcons.Video.imageVector,
|
||||
label = stringResource(R.string.ConversationSettingsFragment__video),
|
||||
enabled = enabled
|
||||
)
|
||||
}
|
||||
@@ -99,8 +100,8 @@ fun CallBar(
|
||||
if (state.isAudioAvailable) {
|
||||
Buttons.ActionButton(
|
||||
onClick = onAudioCallClick,
|
||||
iconResId = if (state.isAudioSecure) R.drawable.ic_phone_right_24 else R.drawable.ic_phone_right_unlock_primary_accent_24,
|
||||
labelResId = if (state.isAudioSecure) R.string.ConversationSettingsFragment__audio else R.string.ConversationSettingsFragment__call,
|
||||
imageVector = if (state.isAudioSecure) SignalIcons.Phone.imageVector else SignalIcons.PhoneUnlock.imageVector,
|
||||
label = stringResource(if (state.isAudioSecure) R.string.ConversationSettingsFragment__audio else R.string.ConversationSettingsFragment__call),
|
||||
enabled = enabled
|
||||
)
|
||||
}
|
||||
@@ -120,8 +121,8 @@ fun CallBar(
|
||||
if (state.isSearchAvailable) {
|
||||
Buttons.ActionButton(
|
||||
onClick = onSearchClick,
|
||||
iconResId = R.drawable.ic_search_24,
|
||||
labelResId = R.string.ConversationSettingsFragment__search,
|
||||
imageVector = SignalIcons.Search.imageVector,
|
||||
label = stringResource(R.string.ConversationSettingsFragment__search),
|
||||
enabled = enabled
|
||||
)
|
||||
}
|
||||
@@ -160,8 +161,8 @@ private fun MuteButton(
|
||||
Box(modifier = modifier) {
|
||||
Buttons.ActionButton(
|
||||
onClick = onClick,
|
||||
iconResId = if (isMuted) R.drawable.ic_bell_disabled_24 else R.drawable.ic_bell_24,
|
||||
labelResId = if (isMuted) R.string.ConversationSettingsFragment__muted else R.string.ConversationSettingsFragment__mute,
|
||||
imageVector = if (isMuted) SignalIcons.BellSlash.imageVector else SignalIcons.Bell.imageVector,
|
||||
label = stringResource(if (isMuted) R.string.ConversationSettingsFragment__muted else R.string.ConversationSettingsFragment__mute),
|
||||
enabled = enabled
|
||||
)
|
||||
|
||||
@@ -169,7 +170,7 @@ private fun MuteButton(
|
||||
MUTE_DURATIONS.forEach { duration ->
|
||||
DropdownMenus.ItemWithIcon(
|
||||
menuController = menuController,
|
||||
drawableResId = duration.iconResId,
|
||||
imageVector = duration.icon.imageVector,
|
||||
stringResId = duration.labelResId,
|
||||
onClick = { onDurationSelected(System.currentTimeMillis() + duration.durationMillis) }
|
||||
)
|
||||
@@ -177,14 +178,14 @@ private fun MuteButton(
|
||||
|
||||
DropdownMenus.ItemWithIcon(
|
||||
menuController = menuController,
|
||||
drawableResId = R.drawable.symbol_calendar_24,
|
||||
imageVector = SignalIcons.Calendar.imageVector,
|
||||
stringResId = R.string.MuteDialog__mute_until,
|
||||
onClick = onCustomTimeClick
|
||||
)
|
||||
|
||||
DropdownMenus.ItemWithIcon(
|
||||
menuController = menuController,
|
||||
drawableResId = R.drawable.symbol_bell_slash_24,
|
||||
imageVector = SignalIcons.BellSlash.imageVector,
|
||||
stringResId = R.string.arrays__always,
|
||||
onClick = { onDurationSelected(Long.MAX_VALUE) }
|
||||
)
|
||||
@@ -314,14 +315,14 @@ private fun CallBarDisabledPreview() {
|
||||
}
|
||||
|
||||
private data class MuteDuration(
|
||||
@DrawableRes val iconResId: Int,
|
||||
val icon: SignalIcons,
|
||||
@StringRes val labelResId: Int,
|
||||
val durationMillis: Long
|
||||
)
|
||||
|
||||
private val MUTE_DURATIONS = listOf(
|
||||
MuteDuration(R.drawable.ic_daytime_24, R.string.arrays__mute_for_one_hour, 1.hours.inWholeMilliseconds),
|
||||
MuteDuration(R.drawable.ic_nighttime_26, R.string.arrays__mute_for_eight_hours, 8.hours.inWholeMilliseconds),
|
||||
MuteDuration(R.drawable.symbol_calendar_one, R.string.arrays__mute_for_one_day, 1.days.inWholeMilliseconds),
|
||||
MuteDuration(R.drawable.symbol_calendar_week, R.string.arrays__mute_for_seven_days, 7.days.inWholeMilliseconds)
|
||||
MuteDuration(SignalIcons.Daytime, R.string.arrays__mute_for_one_hour, 1.hours.inWholeMilliseconds),
|
||||
MuteDuration(SignalIcons.Nighttime, R.string.arrays__mute_for_eight_hours, 8.hours.inWholeMilliseconds),
|
||||
MuteDuration(SignalIcons.CalendarOne, R.string.arrays__mute_for_one_day, 1.days.inWholeMilliseconds),
|
||||
MuteDuration(SignalIcons.CalendarWeek, R.string.arrays__mute_for_seven_days, 7.days.inWholeMilliseconds)
|
||||
)
|
||||
|
||||
+4
-3
@@ -30,6 +30,7 @@ import org.thoughtcrime.securesms.R
|
||||
import org.thoughtcrime.securesms.avatar.AvatarImage
|
||||
import org.thoughtcrime.securesms.profiles.ProfileName
|
||||
import org.thoughtcrime.securesms.recipients.Recipient
|
||||
import org.signal.core.ui.R as CoreUiR
|
||||
|
||||
private val LARGE_ICON_SIZE = 40.dp
|
||||
|
||||
@@ -111,9 +112,9 @@ fun RecipientRow(
|
||||
private fun LargeIconRowPreview() {
|
||||
Previews.Preview {
|
||||
Column {
|
||||
LargeIconRow(text = "Add members", icon = R.drawable.ic_plus_24, onClick = {})
|
||||
LargeIconRow(text = "See all", icon = R.drawable.ic_chevron_down_icon_20, onClick = {})
|
||||
LargeIconRow(text = "Add to a group", icon = R.drawable.ic_plus_24, enabled = false, onClick = {})
|
||||
LargeIconRow(text = "Add members", icon = CoreUiR.drawable.symbol_plus_24, onClick = {})
|
||||
LargeIconRow(text = "See all", icon = R.drawable.symbol_chevron_down_24, onClick = {})
|
||||
LargeIconRow(text = "Add to a group", icon = CoreUiR.drawable.symbol_plus_24, enabled = false, onClick = {})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -318,7 +318,7 @@ private suspend fun showItemContextMenu(
|
||||
|
||||
val actions = buildList {
|
||||
val messageItem = ActionItem(
|
||||
iconRes = R.drawable.ic_chat_message_24,
|
||||
iconRes = CoreUiR.drawable.ic_chat_message_24,
|
||||
title = context.getString(R.string.NewConversationActivity__message),
|
||||
tintRes = CoreUiR.color.signal_colorOnSurface,
|
||||
action = { callbacks.onMessage(recipient.id) }
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="@color/signal_text_toolbar_subtitle"
|
||||
android:pathData="M13.5,5.5A1.5,1.5 0,1 1,12 4,1.5 1.5,0 0,1 13.5,5.5ZM12,10.5A1.5,1.5 0,1 0,13.5 12,1.5 1.5,0 0,0 12,10.5ZM12,17a1.5,1.5 0,1 0,1.5 1.5A1.5,1.5 0,0 0,12 17Z"/>
|
||||
</vector>
|
||||
@@ -1,14 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="16dp"
|
||||
android:height="16dp"
|
||||
android:viewportWidth="16"
|
||||
android:viewportHeight="16">
|
||||
<path
|
||||
android:pathData="M12.2831,8.4211C12.699,7.9623 12.9758,7.3883 13.0794,6.7696C13.1831,6.1509 13.1091,5.5145 12.8665,4.9385C12.6239,4.3626 12.2234,3.8723 11.7141,3.5279C11.2049,3.1835 10.6091,3 10,3C9.3909,3 8.7951,3.1835 8.2859,3.5279C7.7766,3.8723 7.3761,4.3626 7.1335,4.9385C6.8909,5.5145 6.8169,6.1509 6.9206,6.7696C7.0242,7.3883 7.301,7.9623 7.7169,8.4211C6.9461,8.6021 6.2577,9.0474 5.7642,9.684C5.2707,10.3207 5.0013,11.111 5,11.926V13H5.9375V11.926C5.9383,11.2285 6.2074,10.5599 6.6858,10.0668C7.1642,9.5736 7.8128,9.2962 8.4894,9.2954H11.5106C12.1872,9.2962 12.8358,9.5736 13.3142,10.0668C13.7926,10.5599 14.0617,11.2285 14.0625,11.926V13H15V11.926C14.9987,11.111 14.7293,10.3207 14.2358,9.684C13.7423,9.0474 13.0539,8.6021 12.2831,8.4211ZM10,8.49C9.5674,8.49 9.1444,8.3577 8.7847,8.11C8.425,7.8622 8.1446,7.51 7.979,7.0979C7.8134,6.6859 7.7701,6.2325 7.8545,5.7951C7.9389,5.3576 8.1473,4.9558 8.4532,4.6405C8.7591,4.3251 9.1489,4.1103 9.5732,4.0233C9.9976,3.9363 10.4374,3.981 10.8371,4.1516C11.2368,4.3223 11.5785,4.6113 11.8188,4.9822C12.0592,5.353 12.1875,5.789 12.1875,6.235C12.1875,6.833 11.957,7.4066 11.5468,7.8295C11.1366,8.2524 10.5802,8.49 10,8.49Z"
|
||||
android:fillColor="#000000"/>
|
||||
<path
|
||||
android:pathData="M5,6.8H3.2V5H2.8V6.8H1V7.2H2.8V9H3.2V7.2H5V6.8Z"
|
||||
android:strokeWidth="0.5"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#000000"/>
|
||||
</vector>
|
||||
@@ -5,5 +5,5 @@
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M12 1.13C6 1.13 1.12 5.99 1.12 12 1.13 18 6 22.88 12 22.88c6 0 10.88-4.87 10.88-10.88C22.88 6 18 1.12 12 1.12ZM2.87 12c0-5.04 4.09-9.13 9.13-9.13 2.2 0 4.22 0.78 5.8 2.08L4.95 17.8c-1.3-1.58-2.08-3.6-2.08-5.8Zm3.32 7.04L19.04 6.19c1.3 1.58 2.09 3.6 2.09 5.81 0 5.04-4.09 9.13-9.13 9.13-2.2 0-4.23-0.79-5.81-2.1Z"/>
|
||||
android:pathData="M12 1.63C6.27 1.63 1.62 6.26 1.62 12c0 5.73 4.65 10.38 10.38 10.38S22.38 17.73 22.38 12 17.73 1.62 12 1.62ZM3.37 12c0-4.76 3.87-8.63 8.63-8.63 2.07 0 3.96 0.73 5.45 1.94L5.3 17.45c-1.2-1.49-1.93-3.38-1.93-5.45Zm3.18 6.69L18.7 6.55c1.2 1.49 1.93 3.38 1.93 5.45 0 4.76-3.86 8.63-8.62 8.63-2.07 0-3.96-0.73-5.45-1.94Z"/>
|
||||
</vector>
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M12.57 8.25c-0.48 0-0.87 0.4-0.87 0.88v5.74c0 0.49 0.4 0.88 0.88 0.88s0.87-0.4 0.87-0.88V9.13c0-0.49-0.4-0.88-0.88-0.88Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M16.45 9.75h2.13c0.4 0 0.75-0.34 0.75-0.75s-0.34-0.75-0.75-0.75H15.7c-0.55 0-1 0.45-1 1v5.63c0 0.48 0.4 0.87 0.88 0.87s0.87-0.4 0.87-0.88v-2h1.75c0.41 0 0.75-0.33 0.75-0.74 0-0.42-0.34-0.76-0.75-0.76h-1.75V9.75Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M9.08 14.07v-1.12h-0.5c-0.42 0-0.75-0.34-0.75-0.75s0.33-0.75 0.75-0.75h1.25c0.4 0 0.74 0.34 0.74 0.75v2.5c0 0.3-0.18 0.58-0.47 0.7-0.64 0.25-1.22 0.35-1.9 0.35-0.8 0-1.68-0.26-2.36-0.87-0.7-0.62-1.14-1.56-1.14-2.78 0-1.24 0.43-2.22 1.14-2.9 0.7-0.65 1.6-0.95 2.5-0.95 0.57 0 1.11 0.1 1.72 0.37 0.37 0.17 0.54 0.62 0.37 1-0.18 0.37-0.62 0.54-1 0.36-0.38-0.17-0.7-0.23-1.1-0.23-0.49 0-0.95 0.16-1.28 0.47-0.32 0.3-0.6 0.82-0.6 1.68 0 1.53 1.14 2.2 1.93 2.2 0.25 0 0.47 0 0.7-0.03Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M16.44 3.13H7.56c-0.95 0-1.71 0-2.33 0.05-0.64 0.05-1.2 0.16-1.72 0.42-0.82 0.42-1.49 1.1-1.9 1.91C1.33 6.03 1.22 6.6 1.17 7.23 1.12 7.85 1.12 8.61 1.13 9.56v4.88c0 0.95 0 1.71 0.05 2.33 0.05 0.64 0.16 1.2 0.42 1.72 0.42 0.82 1.1 1.49 1.91 1.9 0.52 0.27 1.08 0.38 1.72 0.43 0.62 0.05 1.38 0.05 2.33 0.05h8.88c0.95 0 1.71 0 2.33-0.05 0.64-0.05 1.2-0.16 1.72-0.42 0.82-0.42 1.49-1.1 1.9-1.91 0.27-0.52 0.38-1.08 0.43-1.72 0.05-0.62 0.05-1.38 0.05-2.33V9.56c0-0.95 0-1.71-0.05-2.33-0.05-0.64-0.16-1.2-0.42-1.72-0.42-0.82-1.1-1.49-1.91-1.9-0.52-0.27-1.08-0.38-1.72-0.43-0.62-0.06-1.38-0.06-2.33-0.06ZM4.3 5.15c0.23-0.12 0.53-0.2 1.06-0.24 0.54-0.04 1.24-0.04 2.23-0.04h8.8c1 0 1.69 0 2.23 0.04 0.53 0.04 0.83 0.12 1.06 0.24 0.5 0.25 0.9 0.65 1.15 1.15 0.12 0.23 0.2 0.53 0.24 1.06 0.04 0.54 0.05 1.24 0.05 2.23v4.8c0 1 0 1.69-0.05 2.23-0.04 0.53-0.12 0.83-0.24 1.06-0.25 0.5-0.65 0.9-1.15 1.15-0.23 0.12-0.53 0.2-1.06 0.24-0.54 0.04-1.24 0.05-2.23 0.05H7.6c-1 0-1.69 0-2.23-0.05-0.53-0.04-0.83-0.12-1.06-0.24-0.5-0.25-0.9-0.65-1.15-1.15-0.12-0.23-0.2-0.53-0.24-1.06-0.04-0.54-0.04-1.24-0.04-2.23V9.6c0-1 0-1.69 0.04-2.23 0.04-0.53 0.12-0.83 0.24-1.06 0.25-0.5 0.65-0.9 1.15-1.15Z"/>
|
||||
</vector>
|
||||
@@ -191,7 +191,7 @@
|
||||
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description"
|
||||
android:foreground="?selectableItemBackgroundBorderless"
|
||||
android:scaleType="fitCenter"
|
||||
app:srcCompat="@drawable/ic_camera_24"
|
||||
app:srcCompat="@drawable/symbol_camera_24"
|
||||
app:tint="@color/signal_colorOnSurfaceVariant" />
|
||||
|
||||
<org.thoughtcrime.securesms.components.MicrophoneRecorderView
|
||||
@@ -229,7 +229,7 @@
|
||||
android:background="?selectableItemBackgroundBorderless"
|
||||
android:contentDescription="@string/ConversationActivity_add_attachment"
|
||||
android:scaleType="fitCenter"
|
||||
app:srcCompat="@drawable/ic_plus_24"
|
||||
app:srcCompat="@drawable/symbol_plus_24"
|
||||
app:tint="@color/signal_colorOnSurface" />
|
||||
|
||||
</org.thoughtcrime.securesms.components.HidingLinearLayout>
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
android:id="@+id/start_video"
|
||||
style="@style/Signal.Widget.ImageView.ActionButton"
|
||||
android:contentDescription="@string/ConversationSettingsFragment__start_video_call"
|
||||
app:srcCompat="@drawable/ic_video_call_24" />
|
||||
app:srcCompat="@drawable/symbol_video_24" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/start_video_label"
|
||||
@@ -109,7 +109,7 @@
|
||||
android:id="@+id/start_audio"
|
||||
style="@style/Signal.Widget.ImageView.ActionButton"
|
||||
android:contentDescription="@string/ConversationSettingsFragment__start_audio_call"
|
||||
app:srcCompat="@drawable/ic_phone_right_24" />
|
||||
app:srcCompat="@drawable/symbol_phone_24" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/start_audio_label"
|
||||
@@ -135,7 +135,7 @@
|
||||
android:id="@+id/mute"
|
||||
style="@style/Signal.Widget.ImageView.ActionButton"
|
||||
android:contentDescription="@string/ConversationSettingsFragment__mute"
|
||||
app:srcCompat="@drawable/ic_bell_24" />
|
||||
app:srcCompat="@drawable/symbol_bell_24" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/mute_label"
|
||||
@@ -161,7 +161,7 @@
|
||||
android:id="@+id/search"
|
||||
style="@style/Signal.Widget.ImageView.ActionButton"
|
||||
android:contentDescription="@string/ConversationSettingsFragment__search"
|
||||
app:srcCompat="@drawable/ic_search_24" />
|
||||
app:srcCompat="@drawable/symbol_search_24" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/search_label"
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
android:background="@null"
|
||||
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description"
|
||||
android:scaleType="fitCenter"
|
||||
app:srcCompat="@drawable/ic_mic_24"
|
||||
app:srcCompat="@drawable/symbol_mic_24"
|
||||
app:tint="@color/signal_colorOnSurfaceVariant" />
|
||||
|
||||
<LinearLayout
|
||||
@@ -60,7 +60,7 @@
|
||||
android:padding="18dp"
|
||||
android:tint="@color/core_white"
|
||||
android:visibility="gone"
|
||||
app:srcCompat="@drawable/ic_mic_24"
|
||||
app:srcCompat="@drawable/symbol_mic_24"
|
||||
tools:ignore="ContentDescription"
|
||||
tools:visibility="visible" />
|
||||
</merge>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
<item android:title="@string/conversation_callable_secure__menu_video"
|
||||
android:id="@+id/menu_video_secure"
|
||||
android:icon="@drawable/ic_video_call_24"
|
||||
android:icon="@drawable/symbol_video_24"
|
||||
app:iconTint="@color/signal_icon_tint_primary"
|
||||
app:showAsAction="always" />
|
||||
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
<item android:title="@string/conversation_callable_secure__menu_video"
|
||||
android:id="@+id/menu_video_secure"
|
||||
android:icon="@drawable/ic_video_call_24"
|
||||
android:icon="@drawable/symbol_video_24"
|
||||
app:iconTint="@color/signal_icon_tint_primary"
|
||||
app:showAsAction="always" />
|
||||
|
||||
<item android:title="@string/conversation_callable_secure__menu_call"
|
||||
android:id="@+id/menu_call_secure"
|
||||
android:icon="@drawable/ic_phone_right_24"
|
||||
android:icon="@drawable/symbol_phone_24"
|
||||
app:iconTint="@color/signal_icon_tint_primary"
|
||||
app:showAsAction="always" />
|
||||
|
||||
|
||||
@@ -268,7 +268,7 @@
|
||||
</style>
|
||||
|
||||
<style name="Signal.Toolbar.Overflow" parent="Widget.AppCompat.ActionButton.Overflow">
|
||||
<item name="srcCompat">@drawable/ic_more_vert_24</item>
|
||||
<item name="srcCompat">@drawable/symbol_more_vertical</item>
|
||||
<item name="android:src">@null</item>
|
||||
<item name="android:tint">@color/core_white</item>
|
||||
</style>
|
||||
@@ -280,8 +280,8 @@
|
||||
</style>
|
||||
|
||||
<style name="Signal.Toolbar.Overflow.Conversation">
|
||||
<item name="srcCompat">@drawable/ic_more_vert_conversation_24</item>
|
||||
<item name="android:tint">@null</item>
|
||||
<item name="srcCompat">@drawable/symbol_more_vertical</item>
|
||||
<item name="android:tint">@color/signal_text_toolbar_subtitle</item>
|
||||
</style>
|
||||
|
||||
<style name="Signal.Toolbar.Overflow.PaymentCard">
|
||||
|
||||
@@ -117,6 +117,24 @@ object DropdownMenus {
|
||||
@DrawableRes drawableResId: Int,
|
||||
@StringRes stringResId: Int,
|
||||
onClick: () -> Unit
|
||||
) {
|
||||
ItemWithIcon(
|
||||
menuController = menuController,
|
||||
imageVector = ImageVector.vectorResource(id = drawableResId),
|
||||
stringResId = stringResId,
|
||||
onClick = onClick
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* Properly styled menu item with a leading icon
|
||||
*/
|
||||
@Composable
|
||||
fun ItemWithIcon(
|
||||
menuController: MenuController,
|
||||
imageVector: ImageVector,
|
||||
@StringRes stringResId: Int,
|
||||
onClick: () -> Unit
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
@@ -129,7 +147,7 @@ object DropdownMenus {
|
||||
.padding(horizontal = 16.dp, vertical = 12.dp)
|
||||
) {
|
||||
Icon(
|
||||
imageVector = ImageVector.vectorResource(id = drawableResId),
|
||||
imageVector = imageVector,
|
||||
contentDescription = stringResource(stringResId)
|
||||
)
|
||||
Text(
|
||||
|
||||
@@ -31,17 +31,23 @@ import org.signal.core.ui.R
|
||||
* Signal icon library with all available icons.
|
||||
*/
|
||||
enum class SignalIcons(private val icon: SignalIcon) : SignalIcon by icon {
|
||||
AddToStory(icon(R.drawable.add_to_story_24)),
|
||||
AlbumPlus(icon(R.drawable.symbol_album_plus_24)),
|
||||
ArrowStart(icon(R.drawable.symbol_arrow_start_24)),
|
||||
ArrowEnd(icon(R.drawable.symbol_arrow_end_24)),
|
||||
At(icon(R.drawable.symbol_at_24)),
|
||||
Backup(icon(R.drawable.symbol_backup_24)),
|
||||
Bell(icon(R.drawable.symbol_bell_24)),
|
||||
BellSlash(icon(R.drawable.symbol_bell_slash_24)),
|
||||
Blur(icon(R.drawable.symbol_blur_24)),
|
||||
BrushPen(icon(R.drawable.symbol_brush_pen_24)),
|
||||
BrushHighlighter(icon(R.drawable.symbol_brush_highlighter_24)),
|
||||
Calendar(icon(R.drawable.symbol_calendar_24)),
|
||||
CalendarOne(icon(R.drawable.symbol_calendar_one)),
|
||||
CalendarWeek(icon(R.drawable.symbol_calendar_week)),
|
||||
Camera(icon(R.drawable.symbol_camera_24)),
|
||||
CameraSwitch(icon(R.drawable.symbol_switch_24)),
|
||||
ChatMessage(icon(R.drawable.ic_chat_message_24)),
|
||||
Check(icon(R.drawable.symbol_check_24)),
|
||||
CheckCircle(icon(R.drawable.symbol_check_circle_24)),
|
||||
ChevronRight(icon(R.drawable.symbol_chevron_right_24)),
|
||||
@@ -64,6 +70,7 @@ enum class SignalIcons(private val icon: SignalIcon) : SignalIcon by icon {
|
||||
Folder(icon(R.drawable.symbol_folder_24)),
|
||||
FolderDisplay(icon(R.drawable.symbol_folder_display_48)),
|
||||
Forward(icon(R.drawable.symbol_forward_24)),
|
||||
Group(icon(R.drawable.symbol_group_24)),
|
||||
Info(icon(R.drawable.symbol_info_24)),
|
||||
Key(icon(R.drawable.symbol_key_24)),
|
||||
Keyboard(icon(R.drawable.ic_keyboard_24)),
|
||||
@@ -80,6 +87,7 @@ enum class SignalIcons(private val icon: SignalIcon) : SignalIcon by icon {
|
||||
Pause(icon(R.drawable.symbol_pause_24)),
|
||||
PersonCircle(icon(R.drawable.symbol_person_circle_24)),
|
||||
Phone(icon(R.drawable.symbol_phone_24)),
|
||||
PhoneUnlock(icon(R.drawable.ic_phone_right_unlock_24)),
|
||||
Photo(icon(R.drawable.symbol_photo_24)),
|
||||
Play(icon(R.drawable.symbol_play_24)),
|
||||
Plus(icon(R.drawable.symbol_plus_24)),
|
||||
@@ -103,6 +111,7 @@ enum class SignalIcons(private val icon: SignalIcon) : SignalIcon by icon {
|
||||
TransferDisplay(icon(R.drawable.symbol_transfer_display_48)),
|
||||
Trash(icon(R.drawable.symbol_trash_24)),
|
||||
Undo(icon(R.drawable.symbol_undo_24)),
|
||||
Video(icon(R.drawable.symbol_video_24)),
|
||||
ViewOnce(icon(R.drawable.symbol_view_once_24)),
|
||||
ViewOnceInfinite(icon(R.drawable.symbol_view_once_infinite_24)),
|
||||
X(icon(R.drawable.symbol_x_24)),
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M16.15,22.5C15.2711,22.4807 14.402,22.3116 13.58,22C10.9451,20.9907 8.5523,19.438 6.5571,17.4428C4.562,15.4477 3.0093,13.0549 2,10.42C1.25,8.28 1.36,6.56 2.34,5.16C2.8213,4.4662 3.4766,3.911 4.24,3.55C4.8053,3.2431 5.4634,3.1541 6.0899,3.2996C6.7165,3.4452 7.2679,3.8153 7.64,4.34L9.64,7.24C9.9988,7.7521 10.1618,8.376 10.0994,8.9981C10.037,9.6203 9.7533,10.1994 9.3,10.63L8.41,11.45C8.33,11.52 8.28,11.64 8.33,11.7C8.8857,12.4517 9.4975,13.1604 10.16,13.82C10.8218,14.4801 11.5303,15.0917 12.28,15.65C12.34,15.65 12.46,15.65 12.53,15.57L13.35,14.68C13.7817,14.2285 14.3606,13.9461 14.9822,13.8837C15.6038,13.8214 16.2272,13.9832 16.74,14.34L19.64,16.34C20.1558,16.7024 20.5236,17.2385 20.6761,17.8502C20.8285,18.4618 20.7554,19.1079 20.47,19.67C20.1054,20.4702 19.5363,21.16 18.82,21.67C18.0383,22.2182 17.1047,22.5084 16.15,22.5V22.5ZM3.56,6C3.12,6.62 2.63,7.69 3.41,9.9C4.3398,12.3286 5.769,14.535 7.6053,16.3765C9.4416,18.2179 11.644,19.6534 14.07,20.59C16.28,21.37 17.35,20.88 17.97,20.44C18.4647,20.0982 18.8612,19.6328 19.12,19.09C19.2622,18.8465 19.3082,18.5586 19.249,18.2829C19.1898,18.0072 19.0296,17.7637 18.8,17.6L15.9,15.6C15.6836,15.4453 15.4185,15.3742 15.1537,15.3999C14.889,15.4257 14.6425,15.5465 14.46,15.74C14.15,16.07 13.93,16.3 13.68,16.59C13.4079,16.919 13.0208,17.132 12.5973,17.1859C12.1738,17.2398 11.7457,17.1304 11.4,16.88C10.5935,16.2683 9.8316,15.5999 9.12,14.88C8.3953,14.173 7.7266,13.4107 7.12,12.6C6.8708,12.2546 6.7611,11.8279 6.8131,11.4051C6.865,10.9824 7.0746,10.5948 7.4,10.32C7.7,10.07 7.92,9.85 8.26,9.54C8.4581,9.3614 8.5846,9.1169 8.6158,8.852C8.6471,8.5871 8.5811,8.3198 8.43,8.1L6.43,5.2C6.277,4.9753 6.047,4.8146 5.7834,4.7482C5.5198,4.6819 5.2411,4.7145 5,4.84C4.4259,5.0927 3.9291,5.4929 3.56,6V6ZM19,2C18.3369,2 17.7011,2.2634 17.2322,2.7322C16.7634,3.2011 16.5,3.837 16.5,4.5V6H13.5C13.1022,6 12.7206,6.158 12.4393,6.4393C12.158,6.7206 12,7.1022 12,7.5V10.5C12,10.8978 12.158,11.2794 12.4393,11.5607C12.7206,11.842 13.1022,12 13.5,12H17.5C17.8978,12 18.2793,11.842 18.5606,11.5607C18.8419,11.2794 19,10.8978 19,10.5V7.5C18.9977,7.1909 18.9005,6.8899 18.7217,6.6378C18.5429,6.3856 18.291,6.1944 18,6.09V4.5C18,4.2348 18.1053,3.9804 18.2929,3.7929C18.4804,3.6054 18.7348,3.5 19,3.5C19.2652,3.5 19.5196,3.6054 19.7071,3.7929C19.8946,3.9804 20,4.2348 20,4.5V6H21.5V4.5C21.5,3.837 21.2366,3.2011 20.7677,2.7322C20.2989,2.2634 19.663,2 19,2ZM17.5,10.5H13.5V7.5H17.5V10.5Z" />
|
||||
</vector>
|
||||
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M12 1.38c-3.82 0-7.07 2.93-7.2 7.03-0.14 3.64-0.87 4.94-1.42 5.6-0.15 0.17-0.3 0.31-0.46 0.46l-0.07 0.07c-0.14 0.12-0.3 0.27-0.43 0.42-0.4 0.43-0.67 0.95-0.67 1.74 0 1.32 1.06 2.43 2.4 2.43H7.7c0.39 2.02 2.12 3.5 4.29 3.5s3.9-1.48 4.3-3.5h3.55c1.34 0 2.4-1.1 2.4-2.43 0-0.79-0.28-1.31-0.67-1.74-0.13-0.15-0.3-0.3-0.43-0.42l-0.07-0.07c-0.16-0.15-0.31-0.3-0.46-0.47-0.55-0.65-1.28-1.95-1.41-5.59-0.14-4.1-3.39-7.04-7.21-7.04Zm-5.46 7.1C6.65 5.32 9.1 3.11 12 3.11s5.35 2.21 5.46 5.35c0.13 3.85 0.92 5.6 1.83 6.66 0.21 0.26 0.42 0.46 0.6 0.62l0.1 0.1 0.3 0.29c0.14 0.15 0.21 0.27 0.21 0.56 0 0.39-0.3 0.68-0.65 0.68H4.15c-0.35 0-0.65-0.3-0.65-0.68 0-0.29 0.07-0.4 0.21-0.56l0.3-0.3 0.1-0.09c0.18-0.16 0.39-0.36 0.6-0.62 0.9-1.06 1.7-2.8 1.83-6.66Zm7.95 10.64c-0.35 1.05-1.3 1.75-2.49 1.75-1.19 0-2.14-0.7-2.49-1.75h4.98Z"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,13 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M4.791,8.413a6.74,6.74 0,0 1,0.013 -0.25L6.46,9.819c-0.253,2.928 -0.955,4.382 -1.745,5.315a7.087,7.087 0,0 1,-0.698 0.708,5.05 5.05,0 0,0 -0.306,0.298c-0.14,0.154 -0.211,0.27 -0.211,0.562a0.66,0.66 0,0 0,0.645 0.673h9.871l2.173,2.173c-0.536,1.807 -2.177,3.077 -4.189,3.077 -2.166,0 -3.901,-1.471 -4.292,-3.5L4.145,19.125c-1.338,0 -2.395,-1.1 -2.395,-2.423 0,-0.79 0.277,-1.312 0.666,-1.74a7.07,7.07 0,0 1,0.431 -0.422l0.075,-0.069c0.16,-0.149 0.31,-0.294 0.457,-0.469 0.552,-0.651 1.285,-1.952 1.412,-5.59ZM9.512,19.125c0.344,1.042 1.298,1.75 2.488,1.75s2.144,-0.708 2.488,-1.75L9.512,19.125Z"
|
||||
android:fillColor="#000"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="M20.5,16.702c0,0.13 -0.034,0.247 -0.092,0.347l1.249,1.249a2.44,2.44 0,0 0,0.593 -1.596c0,-0.79 -0.277,-1.312 -0.666,-1.74a7.684,7.684 0,0 0,-0.431 -0.422l-0.075,-0.069a5.364,5.364 0,0 1,-0.457 -0.469c-0.552,-0.651 -1.285,-1.952 -1.412,-5.59 -0.143,-4.1 -3.389,-7.037 -7.209,-7.037a7.192,7.192 0,0 0,-5.135 2.13l1.237,1.238A5.439,5.439 0,0 1,12 3.125c2.896,0 5.35,2.21 5.46,5.35 0.135,3.846 0.922,5.593 1.825,6.659a7.087,7.087 0,0 0,0.698 0.709c0.133,0.122 0.225,0.207 0.306,0.297 0.14,0.154 0.211,0.27 0.211,0.562ZM3.119,1.881A0.875,0.875 0,1 0,1.88 3.12l19,19a0.875,0.875 0,1 0,1.238 -1.238l-19,-19Z"
|
||||
android:fillColor="#000"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,12 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M12.37 11.13c-0.23 0-0.43 0.1-0.57 0.25-0.22 0.25-0.42 0.4-0.64 0.5-0.22 0.11-0.5 0.18-0.86 0.22-0.37 0.05-0.68 0.37-0.68 0.76 0 0.42 0.35 0.77 0.77 0.77h0.98v4.12c0 0.48 0.4 0.88 0.88 0.88s0.88-0.4 0.88-0.88v-5.87c0-0.42-0.34-0.76-0.76-0.76Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M7.5 0.75c0.55 0 1 0.45 1 1v1.88h7V1.75c0-0.55 0.45-1 1-1s1 0.45 1 1v1.88c0.36 0 0.68 0 0.96 0.03 0.47 0.04 0.91 0.12 1.32 0.33 0.64 0.33 1.15 0.84 1.48 1.48 0.2 0.4 0.29 0.85 0.33 1.32 0.04 0.45 0.04 1 0.04 1.67v8.58c0 0.67 0 1.22-0.04 1.67-0.04 0.47-0.12 0.91-0.33 1.32-0.33 0.64-0.84 1.15-1.48 1.48-0.4 0.2-0.85 0.29-1.32 0.33-0.45 0.04-1 0.04-1.67 0.04H7.2c-0.67 0-1.22 0-1.67-0.04-0.47-0.04-0.91-0.12-1.32-0.33-0.64-0.33-1.15-0.84-1.48-1.48-0.2-0.4-0.29-0.85-0.33-1.32-0.04-0.45-0.04-1-0.04-1.67V8.46c0-0.67 0-1.22 0.04-1.67 0.04-0.47 0.12-0.91 0.33-1.32 0.33-0.64 0.84-1.15 1.48-1.48 0.4-0.2 0.85-0.29 1.32-0.33 0.28-0.02 0.6-0.03 0.96-0.03V1.75c0-0.55 0.45-1 1-1ZM5.68 5.41C5.32 5.44 5.14 5.49 5 5.55c-0.3 0.16-0.55 0.4-0.7 0.71-0.07 0.13-0.12 0.3-0.15 0.67-0.02 0.25-0.03 0.55-0.03 0.95h15.74c0-0.4 0-0.7-0.03-0.95-0.03-0.36-0.08-0.54-0.14-0.67-0.16-0.3-0.4-0.55-0.71-0.7-0.13-0.07-0.3-0.12-0.67-0.15-0.37-0.03-0.86-0.04-1.57-0.04h-9.5c-0.71 0-1.2 0-1.57 0.04Zm14.2 4.21H4.13V17c0 0.71 0 1.2 0.03 1.57 0.03 0.36 0.08 0.54 0.14 0.67 0.16 0.3 0.4 0.55 0.71 0.7 0.13 0.07 0.3 0.12 0.67 0.15 0.37 0.03 0.86 0.04 1.57 0.04h9.5c0.71 0 1.2 0 1.57-0.04 0.36-0.03 0.54-0.08 0.67-0.14 0.3-0.16 0.55-0.4 0.7-0.71 0.07-0.13 0.12-0.3 0.15-0.67 0.03-0.37 0.04-0.86 0.04-1.57V9.62Z"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,18 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M7.5 11.25c-0.76 0-1.38 0.62-1.38 1.38C6.13 13.38 6.75 14 7.5 14c0.76 0 1.38-0.62 1.38-1.38 0-0.75-0.62-1.37-1.38-1.37Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M16.5 11.25c-0.76 0-1.38 0.62-1.38 1.38 0 0.75 0.62 1.37 1.38 1.37 0.76 0 1.38-0.62 1.38-1.38 0-0.75-0.62-1.37-1.38-1.37Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M12 11.25c-0.76 0-1.38 0.62-1.38 1.38 0 0.75 0.62 1.37 1.38 1.37 0.76 0 1.38-0.62 1.38-1.38 0-0.75-0.62-1.37-1.38-1.37Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M7.5 0.75c0.55 0 1 0.45 1 1v1.88h7V1.75c0-0.55 0.45-1 1-1s1 0.45 1 1v1.88c0.36 0 0.68 0 0.96 0.03 0.47 0.04 0.91 0.12 1.32 0.33 0.64 0.33 1.15 0.84 1.48 1.48 0.2 0.4 0.29 0.85 0.33 1.32 0.04 0.45 0.04 1 0.04 1.67v8.58c0 0.67 0 1.22-0.04 1.67-0.04 0.47-0.12 0.91-0.33 1.32-0.33 0.64-0.84 1.15-1.48 1.48-0.4 0.2-0.85 0.29-1.32 0.33-0.45 0.04-1 0.04-1.67 0.04H7.2c-0.67 0-1.22 0-1.67-0.04-0.47-0.04-0.91-0.12-1.32-0.33-0.64-0.33-1.15-0.84-1.48-1.48-0.2-0.4-0.29-0.85-0.33-1.32-0.04-0.45-0.04-1-0.04-1.67V8.46c0-0.67 0-1.22 0.04-1.67 0.04-0.47 0.12-0.91 0.33-1.32 0.33-0.64 0.84-1.15 1.48-1.48 0.4-0.2 0.85-0.29 1.32-0.33 0.28-0.02 0.6-0.03 0.96-0.03V1.75c0-0.55 0.45-1 1-1Zm-2.49 4.8c-0.3 0.16-0.55 0.4-0.7 0.71-0.07 0.13-0.12 0.3-0.15 0.67-0.02 0.25-0.03 0.55-0.03 0.95h15.74c0-0.4 0-0.7-0.03-0.95-0.03-0.36-0.08-0.54-0.14-0.67-0.16-0.3-0.4-0.55-0.71-0.7-0.13-0.07-0.3-0.12-0.67-0.15-0.37-0.03-0.86-0.04-1.57-0.04h-9.5c-0.71 0-1.2 0-1.57 0.04C5.32 5.44 5.14 5.49 5 5.55ZM4.13 9.63V17c0 0.71 0 1.2 0.03 1.57 0.03 0.36 0.08 0.54 0.14 0.67 0.16 0.3 0.4 0.55 0.71 0.7 0.13 0.07 0.3 0.12 0.67 0.15 0.37 0.03 0.86 0.04 1.57 0.04h9.5c0.71 0 1.2 0 1.57-0.04 0.36-0.03 0.54-0.08 0.67-0.14 0.3-0.16 0.55-0.4 0.7-0.71 0.07-0.13 0.12-0.3 0.15-0.67 0.03-0.37 0.04-0.86 0.04-1.57V9.62H4.13Z"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,18 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M13 7.15c0-2.13 1.43-4.03 3.5-4.03 2.07 0 3.5 1.9 3.5 4.03 0 1.08-0.35 2.1-0.95 2.88-0.6 0.78-1.5 1.35-2.55 1.35-1.06 0-1.95-0.57-2.55-1.35C13.35 9.26 13 8.23 13 7.15Zm3.5-2.28c-0.83 0-1.75 0.82-1.75 2.28 0 0.71 0.23 1.36 0.59 1.81 0.35 0.46 0.77 0.66 1.16 0.66 0.4 0 0.81-0.2 1.16-0.66 0.36-0.45 0.59-1.1 0.59-1.81 0-1.46-0.92-2.28-1.75-2.28Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M7.5 12.63c1.12 0 2.19 0.24 3.14 0.67-0.47 0.41-0.89 0.87-1.24 1.38-0.58-0.2-1.22-0.3-1.9-0.3-2.68 0-4.72 1.7-5.07 3.74h5.72l-0.03 0.63c0 0.39 0.03 0.76 0.1 1.13H1.75c-0.6 0-1.14-0.48-1.14-1.13 0-3.49 3.2-6.13 6.88-6.13Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M16.5 12.63c-3.68 0-6.88 2.63-6.88 6.12 0 0.65 0.54 1.13 1.14 1.13h11.48c0.6 0 1.14-0.48 1.14-1.13 0-3.49-3.2-6.13-6.88-6.13Zm0 1.74c2.68 0 4.72 1.71 5.07 3.76H11.43c0.35-2.05 2.4-3.75 5.07-3.75Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M7.5 3.13C5.43 3.13 4 5.01 4 7.14c0 1.08 0.35 2.1 0.95 2.88 0.6 0.78 1.5 1.35 2.55 1.35 1.06 0 1.95-0.57 2.55-1.35 0.6-0.77 0.95-1.8 0.95-2.88 0-2.13-1.43-4.03-3.5-4.03ZM5.75 7.14c0-1.46 0.92-2.28 1.75-2.28S9.25 5.7 9.25 7.15c0 0.71-0.24 1.36-0.59 1.81C8.31 9.42 7.9 9.62 7.5 9.62c-0.4 0-0.81-0.2-1.16-0.66-0.35-0.45-0.59-1.1-0.59-1.81Z"/>
|
||||
</vector>
|
||||
@@ -5,8 +5,8 @@
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M11.13 16.24c-0.46-0.28-0.76-0.79-0.76-1.36 0-0.9 0.73-1.63 1.63-1.63 0.9 0 1.63 0.73 1.63 1.63 0 0.57-0.3 1.08-0.76 1.36v1.51c0 0.48-0.39 0.88-0.87 0.88s-0.88-0.4-0.88-0.88v-1.5Z"/>
|
||||
android:pathData="M11.13 16.5c-0.46-0.3-0.76-0.8-0.76-1.38 0-0.9 0.73-1.62 1.63-1.62 0.9 0 1.63 0.73 1.63 1.63 0 0.57-0.3 1.08-0.76 1.36v1.76c0 0.48-0.39 0.88-0.87 0.88s-0.88-0.4-0.88-0.88v-1.76Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M5.88 6.75v2.8c-0.6 0.32-1.08 0.81-1.39 1.42-0.2 0.4-0.29 0.85-0.33 1.32-0.04 0.45-0.04 1-0.04 1.67v4.08c0 0.67 0 1.22 0.04 1.67 0.04 0.47 0.12 0.91 0.33 1.32 0.33 0.64 0.84 1.15 1.48 1.48 0.4 0.2 0.85 0.29 1.32 0.33 0.45 0.04 1 0.04 1.67 0.04h6.08c0.67 0 1.22 0 1.67-0.04 0.47-0.04 0.91-0.12 1.32-0.33 0.64-0.33 1.15-0.84 1.48-1.48 0.2-0.4 0.29-0.85 0.33-1.32 0.04-0.45 0.04-1 0.04-1.67v-4.08c0-0.67 0-1.22-0.04-1.67-0.04-0.47-0.12-0.91-0.33-1.32-0.31-0.6-0.8-1.1-1.39-1.43V6.75c0-3.38-2.74-6.13-6.12-6.13S5.87 3.38 5.87 6.75Zm10.5 0v2.4c-0.39-0.03-0.83-0.03-1.34-0.03H8.96c-0.5 0-0.95 0-1.34 0.02V6.75c0-2.42 1.96-4.38 4.38-4.38s4.38 1.96 4.38 4.38Zm-9.62 4.3c0.13-0.06 0.3-0.11 0.67-0.14 0.37-0.03 0.86-0.04 1.57-0.04h6c0.71 0 1.2 0 1.57 0.04 0.36 0.03 0.54 0.08 0.67 0.14 0.3 0.16 0.55 0.4 0.7 0.71 0.07 0.13 0.12 0.3 0.15 0.67 0.03 0.37 0.04 0.86 0.04 1.57v4c0 0.71 0 1.2-0.04 1.57-0.03 0.36-0.08 0.54-0.14 0.67-0.16 0.3-0.4 0.55-0.71 0.7-0.13 0.07-0.3 0.12-0.67 0.15-0.37 0.03-0.86 0.04-1.57 0.04H9c-0.71 0-1.2 0-1.57-0.04-0.36-0.03-0.54-0.08-0.67-0.14-0.3-0.16-0.55-0.4-0.7-0.71-0.07-0.13-0.12-0.3-0.15-0.67C5.88 19.2 5.87 18.71 5.87 18v-4c0-0.71 0-1.2 0.04-1.57 0.03-0.36 0.08-0.54 0.14-0.67 0.16-0.3 0.4-0.55 0.71-0.7Z"/>
|
||||
android:pathData="M5.88 6.75v2.73L5.74 9.55c-0.73 0.37-1.32 0.96-1.7 1.7-0.23 0.46-0.33 0.95-0.37 1.5-0.05 0.54-0.05 1.2-0.04 2.01v2.98c0 0.8 0 1.47 0.04 2C3.7 20.3 3.8 20.8 4.05 21.26c0.37 0.73 0.96 1.32 1.7 1.7 0.46 0.23 0.95 0.33 1.5 0.37 0.54 0.05 1.2 0.05 2.01 0.05h5.48c0.8 0 1.47 0 2-0.05 0.56-0.04 1.05-0.14 1.52-0.38 0.73-0.37 1.32-0.96 1.7-1.7 0.23-0.46 0.33-0.95 0.37-1.5 0.05-0.54 0.05-1.2 0.05-2.01v-2.98c0-0.8 0-1.47-0.05-2-0.04-0.56-0.14-1.05-0.38-1.52-0.37-0.73-0.96-1.32-1.7-1.7l-0.13-0.06V6.75c0-3.38-2.74-6.13-6.12-6.13S5.87 3.38 5.87 6.75Zm10.5 0v2.4c-0.47-0.03-1.01-0.03-1.64-0.03H9.26c-0.63 0-1.17 0-1.63 0.03v-2.4c0-2.42 1.95-4.38 4.37-4.38s4.38 1.96 4.38 4.38Zm-9.84 4.36C6.7 11 6.95 10.95 7.4 10.9c0.46-0.03 1.05-0.04 1.9-0.04h5.4c0.85 0 1.44 0 1.9 0.04 0.45 0.04 0.69 0.1 0.86 0.2 0.4 0.2 0.73 0.53 0.93 0.93 0.1 0.17 0.16 0.41 0.2 0.86 0.03 0.46 0.04 1.05 0.04 1.9v2.9c0 0.85 0 1.44-0.04 1.9-0.04 0.45-0.1 0.69-0.2 0.86-0.2 0.4-0.53 0.73-0.93 0.93-0.17 0.1-0.41 0.16-0.86 0.2-0.46 0.03-1.05 0.04-1.9 0.04H9.3c-0.85 0-1.44 0-1.9-0.04-0.45-0.04-0.69-0.1-0.86-0.2-0.4-0.2-0.73-0.53-0.93-0.93-0.1-0.17-0.16-0.41-0.2-0.86-0.03-0.46-0.04-1.05-0.04-1.9v-2.9c0-0.85 0-1.44 0.04-1.9 0.04-0.45 0.1-0.69 0.2-0.86 0.2-0.4 0.53-0.73 0.93-0.93Z"/>
|
||||
</vector>
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M6.76 3.63h4.98c0.8 0 1.47 0 2 0.04 0.56 0.04 1.05 0.14 1.52 0.38 0.73 0.37 1.32 0.96 1.7 1.7 0.23 0.46 0.33 0.95 0.37 1.5 0.04 0.46 0.04 1 0.04 1.64l2.8-2.8c1.19-1.18 3.2-0.35 3.2 1.32v9.18c0 1.67-2.01 2.5-3.2 1.32l-2.8-2.8c0 0.64 0 1.18-0.04 1.63-0.04 0.56-0.14 1.05-0.38 1.52-0.37 0.73-0.96 1.32-1.7 1.7-0.46 0.23-0.95 0.33-1.5 0.37-0.54 0.05-1.2 0.05-2.01 0.05H6.76c-0.8 0-1.47 0-2-0.05C4.2 20.3 3.7 20.2 3.24 19.95c-0.73-0.37-1.32-0.96-1.7-1.7-0.23-0.46-0.33-0.95-0.37-1.5-0.05-0.54-0.05-1.2-0.04-2.01V9.26c0-0.8 0-1.47 0.04-2C1.2 6.7 1.3 6.2 1.55 5.74c0.37-0.73 0.96-1.32 1.7-1.7 0.46-0.23 0.95-0.33 1.5-0.37 0.54-0.05 1.2-0.05 2.01-0.04Zm8.86 5.67c0-0.85 0-1.44-0.03-1.9-0.04-0.45-0.1-0.69-0.2-0.86-0.2-0.4-0.53-0.73-0.93-0.93-0.17-0.1-0.41-0.16-0.86-0.2-0.46-0.03-1.05-0.04-1.9-0.04H6.8c-0.85 0-1.44 0-1.9 0.04-0.45 0.04-0.69 0.1-0.86 0.2C3.64 5.8 3.3 6.14 3.1 6.54 3 6.7 2.95 6.95 2.9 7.4 2.88 7.86 2.87 8.45 2.87 9.3v5.4c0 0.85 0 1.44 0.04 1.9 0.04 0.45 0.1 0.69 0.2 0.86 0.2 0.4 0.53 0.73 0.93 0.93 0.17 0.1 0.41 0.16 0.86 0.2 0.46 0.03 1.05 0.04 1.9 0.04h4.9c0.85 0 1.44 0 1.9-0.04 0.45-0.04 0.69-0.1 0.86-0.2 0.4-0.2 0.73-0.53 0.93-0.93 0.1-0.17 0.16-0.41 0.2-0.86 0.03-0.46 0.04-1.05 0.04-1.9V9.3Zm1.76 2.7c0 0.4 0.16 0.8 0.45 1.09l3.58 3.58 0.06 0.04h0.08l0.06-0.05c0-0.01 0.02-0.03 0.02-0.07V7.4c0-0.04-0.02-0.06-0.02-0.07L21.55 7.3l-0.08-0.01s-0.03 0-0.06 0.04l-3.58 3.58c-0.3 0.29-0.45 0.68-0.45 1.09Z"/>
|
||||
</vector>
|
||||
Reference in New Issue
Block a user