RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: knew i forgot something

This commit is contained in:
infi 2026-02-20 12:43:04 +01:00
parent 839247acd0
commit 4015513b96
73 changed files with 222 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/chat/stoat/activities/InviteActivity.kt
View File

@ -280,7 +280,7 @@ fun InvalidInviteError(error: StoatAPIError? = null, onDismissRequest: () -> Uni
onDismissRequest = onDismissRequest,
icon = {
Icon(
painter = painterResource(R.drawable.icn_error_24dp),
painter = painterResource(R.drawable.ic_error_24dp),
contentDescription = null, // decorative
tint = MaterialTheme.colorScheme.primary
)
@ -326,7 +326,7 @@ fun NoInviteSpecifiedError(onDismissRequest: () -> Unit) {
onDismissRequest = onDismissRequest,
icon = {
Icon(
painter = painterResource(R.drawable.icn_error_24dp),
painter = painterResource(R.drawable.ic_error_24dp),
contentDescription = null, // decorative
tint = MaterialTheme.colorScheme.primary
)

6
app/src/main/java/chat/stoat/activities/media/ImageViewActivity.kt
View File

@ -205,7 +205,7 @@ fun ImageViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) {
onClose()
}) {
Icon(
painter = painterResource(id = R.drawable.icn_arrow_back_24dp),
painter = painterResource(id = R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}
@ -215,7 +215,7 @@ fun ImageViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) {
shareSubmenuIsOpen.value = true
}) {
Icon(
painter = painterResource(id = R.drawable.icn_ios_share_24dp),
painter = painterResource(id = R.drawable.ic_ios_share_24dp),
contentDescription = stringResource(id = R.string.share)
)
}
@ -254,7 +254,7 @@ fun ImageViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) {
saveToGallery()
}) {
Icon(
painter = painterResource(id = R.drawable.icn_download_24dp),
painter = painterResource(id = R.drawable.ic_download_24dp),
contentDescription = stringResource(
id = R.string.media_viewer_save
)

2
app/src/main/java/chat/stoat/activities/voice/IncomingActivity.kt
View File

@ -278,7 +278,7 @@ fun IncomingCallInner() {
.background(MaterialTheme.colorScheme.tertiaryContainer)
) {
Icon(
painter = painterResource(R.drawable.icn_call_24dp__fill),
painter = painterResource(R.drawable.ic_call_24dp__fill),
contentDescription = null,
tint = MaterialTheme.colorScheme.onTertiaryContainer,
modifier = Modifier

4
app/src/main/java/chat/stoat/c2dm/HandlerService.kt
View File

@ -158,7 +158,7 @@ class HandlerService : FirebaseMessagingService() {
val action: NotificationCompat.Action =
NotificationCompat.Action.Builder(
R.drawable.icn_reply_24dp,
R.drawable.ic_reply_24dp,
getString(R.string.message_context_sheet_actions_reply),
PendingIntent.getActivity(
this,
@ -178,7 +178,7 @@ class HandlerService : FirebaseMessagingService() {
)
val builder = NotificationCompat.Builder(this, CHANNEL_ID_GROUP_CONVERSATIONS_MESSAGES)
.setSmallIcon(R.drawable.icn_chat_24dp)
.setSmallIcon(R.drawable.ic_chat_24dp)
.setContentTitle(user.displayName ?: user.username)
.setContentText(message.content)
.setContentIntent(contentIntent)

10
app/src/main/java/chat/stoat/composables/chat/InlineBadge.kt
View File

@ -27,35 +27,35 @@ fun InlineBadge(
) {
when (badge) {
InlineBadge.Bot -> Icon(
painter = painterResource(id = R.drawable.icn_smart_toy_24dp),
painter = painterResource(id = R.drawable.ic_smart_toy_24dp),
contentDescription = stringResource(id = R.string.badge_bot_alt),
tint = colour,
modifier = modifier
)
InlineBadge.Bridge -> Icon(
painter = painterResource(id = R.drawable.icn_link_24dp),
painter = painterResource(id = R.drawable.ic_link_24dp),
contentDescription = stringResource(id = R.string.badge_masquerade_alt),
tint = colour,
modifier = modifier
)
InlineBadge.PlatformModeration -> Icon(
painter = painterResource(id = R.drawable.icn_brightness_alert_24dp),
painter = painterResource(id = R.drawable.ic_brightness_alert_24dp),
contentDescription = stringResource(id = R.string.badge_bot_alt),
tint = colour,
modifier = modifier
)
InlineBadge.TeamMember -> Icon(
painter = painterResource(id = R.drawable.icn_hardware_24dp),
painter = painterResource(id = R.drawable.ic_hardware_24dp),
contentDescription = stringResource(id = R.string.badge_team_member_alt),
tint = colour,
modifier = modifier
)
InlineBadge.Webhook -> Icon(
painter = painterResource(id = R.drawable.icn_cloud_24dp),
painter = painterResource(id = R.drawable.ic_cloud_24dp),
contentDescription = stringResource(id = R.string.badge_webhook_alt),
tint = colour,
modifier = modifier.padding(start = 4.dp)

6
app/src/main/java/chat/stoat/composables/chat/Message.kt
View File

@ -279,7 +279,7 @@ fun Message(
modifier = Modifier.padding(vertical = 8.dp)
) {
Icon(
painter = painterResource(R.drawable.icn_block_24dp),
painter = painterResource(R.drawable.ic_block_24dp),
contentDescription = null
)
@ -427,7 +427,7 @@ fun Message(
if (message.edited != null) {
Icon(
painter = painterResource(R.drawable.icn_edit_24dp),
painter = painterResource(R.drawable.ic_edit_24dp),
contentDescription = stringResource(id = R.string.edited),
tint = MaterialTheme.colorScheme.onBackground.copy(
alpha = 0.5f
@ -631,7 +631,7 @@ fun Message(
.padding(8.dp)
) {
Icon(
painter = painterResource(R.drawable.icn_add_reaction_24dp),
painter = painterResource(R.drawable.ic_add_reaction_24dp),
contentDescription = stringResource(R.string.message_context_sheet_actions_react),
modifier = Modifier.size(16.dp)
)

4
app/src/main/java/chat/stoat/composables/chat/MessageAttachment.kt
View File

@ -56,7 +56,7 @@ fun FileAttachment(attachment: AutumnResource) {
verticalAlignment = Alignment.CenterVertically
) {
Icon(
painter = painterResource(id = R.drawable.icn_file_present_24dp),
painter = painterResource(id = R.drawable.ic_file_present_24dp),
contentDescription = null
)
@ -138,7 +138,7 @@ fun VideoPlayButton() {
)
Icon(
painter = painterResource(R.drawable.icn_play_arrow_24dp),
painter = painterResource(R.drawable.ic_play_arrow_24dp),
contentDescription = stringResource(id = R.string.media_viewer_play),
modifier = Modifier
.width(32.dp)

8
app/src/main/java/chat/stoat/composables/chat/MessageField.kt
View File

@ -475,7 +475,7 @@ fun MessageField(
label = { Text("@${item.content}") },
icon = {
Icon(
painter = painterResource(R.drawable.icn_campaign_24dp),
painter = painterResource(R.drawable.ic_campaign_24dp),
contentDescription = null,
modifier = Modifier
.size(SuggestionChipDefaults.IconSize)
@ -582,7 +582,7 @@ fun MessageField(
)
Icon(
painter = painterResource(R.drawable.icn_mood_24dp),
painter = painterResource(R.drawable.ic_mood_24dp),
tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
contentDescription = stringResource(id = R.string.pick_emoji_alt),
modifier = Modifier
@ -621,8 +621,8 @@ fun MessageField(
) {
Icon(
painter = when {
editMode -> painterResource(R.drawable.icn_edit_24dp)
else -> painterResource(R.drawable.icn_send_24dp)
editMode -> painterResource(R.drawable.ic_edit_24dp)
else -> painterResource(R.drawable.ic_send_24dp)
},
tint = MaterialTheme.colorScheme.primary,
contentDescription = stringResource(id = R.string.send_alt),

22
app/src/main/java/chat/stoat/composables/chat/SystemMessage.kt
View File

@ -185,7 +185,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
when (type) {
SystemMessageType.CHANNEL_OWNERSHIP_CHANGED -> {
Icon(
painter = painterResource(R.drawable.icn_key_24dp),
painter = painterResource(R.drawable.ic_key_24dp),
contentDescription = stringResource(R.string.system_message_ownership_changed_alt),
tint = LocalContentColor.current,
modifier = modifier.size(size)
@ -194,7 +194,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
SystemMessageType.CHANNEL_ICON_CHANGED -> {
Icon(
painter = painterResource(R.drawable.icn_landscape_2_edit_24dp),
painter = painterResource(R.drawable.ic_landscape_2_edit_24dp),
contentDescription = stringResource(
R.string.system_message_channel_icon_changed_alt
),
@ -205,7 +205,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
SystemMessageType.CHANNEL_DESCRIPTION_CHANGED -> {
Icon(
painter = painterResource(R.drawable.icn_contract_edit_24dp),
painter = painterResource(R.drawable.ic_contract_edit_24dp),
contentDescription = stringResource(
R.string.system_message_channel_description_changed_alt
),
@ -216,7 +216,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
SystemMessageType.CHANNEL_RENAMED -> {
Icon(
painter = painterResource(R.drawable.icn_ink_highlighter_move_24dp),
painter = painterResource(R.drawable.ic_ink_highlighter_move_24dp),
contentDescription = stringResource(R.string.system_message_channel_renamed_alt),
tint = LocalContentColor.current,
modifier = modifier.size(size)
@ -225,7 +225,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
SystemMessageType.USER_REMOVE -> {
Icon(
painter = painterResource(R.drawable.icn_group_remove_24dp),
painter = painterResource(R.drawable.ic_group_remove_24dp),
contentDescription = stringResource(R.string.system_message_user_removed_alt),
tint = LocalContentColor.current,
modifier = modifier.size(size)
@ -234,7 +234,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
SystemMessageType.USER_ADDED -> {
Icon(
painter = painterResource(R.drawable.icn_group_add_24dp),
painter = painterResource(R.drawable.ic_group_add_24dp),
contentDescription = stringResource(R.string.system_message_user_added_alt),
tint = LocalContentColor.current,
modifier = modifier.size(size)
@ -243,7 +243,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
SystemMessageType.USER_BANNED -> {
Icon(
painter = painterResource(R.drawable.icn_gavel_24dp),
painter = painterResource(R.drawable.ic_gavel_24dp),
contentDescription = stringResource(R.string.system_message_user_banned_alt),
tint = LocalContentColor.current,
modifier = modifier.size(size)
@ -252,7 +252,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
SystemMessageType.USER_KICKED -> {
Icon(
painter = painterResource(R.drawable.icn_sports_and_outdoors_24dp),
painter = painterResource(R.drawable.ic_sports_and_outdoors_24dp),
contentDescription = stringResource(R.string.system_message_user_kicked_alt),
tint = LocalContentColor.current,
modifier = modifier.size(size)
@ -261,7 +261,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
SystemMessageType.USER_LEFT -> {
Icon(
painter = painterResource(R.drawable.icn_door_open_24dp),
painter = painterResource(R.drawable.ic_door_open_24dp),
contentDescription = stringResource(R.string.system_message_user_left_alt),
tint = LocalContentColor.current,
modifier = modifier.size(size)
@ -270,7 +270,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
SystemMessageType.USER_JOINED -> {
Icon(
painter = painterResource(R.drawable.icn_waving_hand_24dp),
painter = painterResource(R.drawable.ic_waving_hand_24dp),
contentDescription = stringResource(R.string.system_message_user_joined_alt),
tint = LocalContentColor.current,
modifier = modifier.size(size),
@ -279,7 +279,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
SystemMessageType.TEXT -> {
Icon(
painter = painterResource(R.drawable.icn_info_24dp),
painter = painterResource(R.drawable.ic_info_24dp),
contentDescription = stringResource(R.string.system_message_text_alt),
tint = LocalContentColor.current,
modifier = modifier.size(size)

2
app/src/main/java/chat/stoat/composables/chat/UnsupportedMessage.kt
View File

@ -55,7 +55,7 @@ fun UnsupportedMessage(modifier: Modifier = Modifier, context: String? = null) {
LocalContentColor provides MaterialTheme.colorScheme.onErrorContainer,
) {
Icon(
painter = painterResource(R.drawable.icn_error_24dp),
painter = painterResource(R.drawable.ic_error_24dp),
contentDescription = null,
tint = LocalContentColor.current,
modifier = Modifier.size(24.dp)

4
app/src/main/java/chat/stoat/composables/chat/UserBadgeList.kt
View File

@ -92,7 +92,7 @@ fun BadgeListEntry(badge: UserBadges) {
UserBadges.ActiveSupporter.value -> {
BadgeListEntryTemplate(
label = stringResource(R.string.user_badge_active_supporter),
icon = painterResource(R.drawable.icn_emoji_people_24dp)
icon = painterResource(R.drawable.ic_emoji_people_24dp)
)
}
@ -157,7 +157,7 @@ fun UserBadgeRow(badges: Long) {
UserBadges.ResponsibleDisclosure -> painterResource(R.drawable.user_badge_disclosure)
UserBadges.Founder -> painterResource(R.drawable.user_badge_founder)
UserBadges.PlatformModeration -> painterResource(R.drawable.user_badge_moderation)
UserBadges.ActiveSupporter -> painterResource(R.drawable.icn_emoji_people_24dp)
UserBadges.ActiveSupporter -> painterResource(R.drawable.ic_emoji_people_24dp)
UserBadges.Paw -> painterResource(R.drawable.user_badge_paw)
UserBadges.EarlyAdopter -> painterResource(R.drawable.user_badge_early_adopter)
UserBadges.ReservedRelevantJokeBadge1 -> painterResource(R.drawable.user_badge_reserved_relevant_one)

22
app/src/main/java/chat/stoat/composables/emoji/EmojiPicker.kt
View File

@ -228,7 +228,7 @@ fun EmojiPicker(
innerTextField()
Icon(
painter = painterResource(R.drawable.icn_close_24dp),
painter = painterResource(R.drawable.ic_close_24dp),
contentDescription = stringResource(R.string.emoji_picker_clear_search),
modifier = Modifier
.clip(CircleShape)
@ -340,7 +340,7 @@ fun EmojiPicker(
textAlign = TextAlign.Center
)
Icon(
painter = painterResource(R.drawable.icn_keyboard_arrow_right_24dp),
painter = painterResource(R.drawable.ic_keyboard_arrow_right_24dp),
contentDescription = stringResource(
R.string.emoji_picker_close_skin_tone_menu
),
@ -442,39 +442,39 @@ fun EmojiPicker(
Icon(
painter = when (category) {
UnicodeEmojiSection.Smileys -> painterResource(
R.drawable.icn_mood_24dp
R.drawable.ic_mood_24dp
)
UnicodeEmojiSection.People -> painterResource(
R.drawable.icn_emoji_people_24dp
R.drawable.ic_emoji_people_24dp
)
UnicodeEmojiSection.Animals -> painterResource(
R.drawable.icn_emoji_nature_24dp
R.drawable.ic_emoji_nature_24dp
)
UnicodeEmojiSection.Food -> painterResource(
R.drawable.icn_sports_bar_24dp
R.drawable.ic_sports_bar_24dp
)
UnicodeEmojiSection.Travel -> painterResource(
R.drawable.icn_bus_railway_24dp
R.drawable.ic_bus_railway_24dp
)
UnicodeEmojiSection.Activities -> painterResource(
R.drawable.icn_sports_and_outdoors_24dp
R.drawable.ic_sports_and_outdoors_24dp
)
UnicodeEmojiSection.Objects -> painterResource(
R.drawable.icn_emoji_objects_24dp
R.drawable.ic_emoji_objects_24dp
)
UnicodeEmojiSection.Symbols -> painterResource(
R.drawable.icn_emoji_symbols_24dp
R.drawable.ic_emoji_symbols_24dp
)
UnicodeEmojiSection.Flags -> painterResource(
R.drawable.icn_flag_24dp
R.drawable.ic_flag_24dp
)
},
contentDescription = null,

6
app/src/main/java/chat/stoat/composables/generic/InlineMediaPicker.kt
View File

@ -68,7 +68,7 @@ fun InlineMediaPicker(
enabled = (currentModel != null) && enabled
) {
Icon(
painter = painterResource(R.drawable.icn_close_24dp),
painter = painterResource(R.drawable.ic_close_24dp),
contentDescription = stringResource(R.string.inline_media_picker_remove)
)
}
@ -94,7 +94,7 @@ fun InlineMediaPicker(
modifier = Modifier.width(480.dp)
) {
Icon(
painter = painterResource(R.drawable.icn_close_24dp),
painter = painterResource(R.drawable.ic_close_24dp),
contentDescription = null
)
@ -181,7 +181,7 @@ fun InlineMediaPickerMediaPicker(
) {
if (circular) {
Icon(
painter = painterResource(R.drawable.icn_add_24dp),
painter = painterResource(R.drawable.ic_add_24dp),
contentDescription = stringResource(R.string.inline_media_picker_no_media_placeholder)
)
} else {

2
app/src/main/java/chat/stoat/composables/generic/NonIdealState.kt
View File

@ -108,7 +108,7 @@ fun NonIdealStatePreviewNoActions() {
NonIdealState(
icon = {
Icon(
painter = painterResource(R.drawable.icn_error_24dp),
painter = painterResource(R.drawable.ic_error_24dp),
contentDescription = null,
modifier = Modifier.size(it)
)

6
app/src/main/java/chat/stoat/composables/media/AudioPlayer.kt
View File

@ -232,12 +232,12 @@ fun AudioPlayer(url: String, filename: String, contentType: String) {
} else {
if (isPlaying.value) {
Icon(
painter = painterResource(R.drawable.icn_pause_24dp),
painter = painterResource(R.drawable.ic_pause_24dp),
contentDescription = stringResource(R.string.media_viewer_pause)
)
} else {
Icon(
painter = painterResource(R.drawable.icn_play_arrow_24dp),
painter = painterResource(R.drawable.ic_play_arrow_24dp),
contentDescription = stringResource(R.string.media_viewer_play)
)
}
@ -265,7 +265,7 @@ fun AudioPlayer(url: String, filename: String, contentType: String) {
showMenu.value = !showMenu.value
}) {
Icon(
painter = painterResource(R.drawable.icn_more_vert_24dp),
painter = painterResource(R.drawable.ic_more_vert_24dp),
contentDescription = stringResource(R.string.media_viewer_more)
)
DropdownMenu(

6
app/src/main/java/chat/stoat/composables/media/MediaPickerGateway.kt
View File

@ -66,7 +66,7 @@ fun MediaPickerGateway(
.padding(8.dp)
) {
Icon(
painterResource(R.drawable.icn_photo_library_24dp),
painterResource(R.drawable.ic_photo_library_24dp),
contentDescription = null,
)
Text(
@ -102,7 +102,7 @@ fun MediaPickerGateway(
.padding(8.dp)
) {
Icon(
painterResource(R.drawable.icn_attach_file_24dp),
painterResource(R.drawable.ic_attach_file_24dp),
contentDescription = null,
)
Text(
@ -126,7 +126,7 @@ fun MediaPickerGateway(
.padding(8.dp)
) {
Icon(
painterResource(R.drawable.icn_camera_24dp),
painterResource(R.drawable.ic_camera_24dp),
contentDescription = null,
)
Text(

2
app/src/main/java/chat/stoat/composables/screens/chat/AttachmentManager.kt
View File

@ -137,7 +137,7 @@ fun FilePreviewSheet(
onRemove()
}, modifier = Modifier.weight(1f)) {
Icon(
painterResource(R.drawable.icn_attach_file_off_24dp),
painterResource(R.drawable.ic_attach_file_off_24dp),
contentDescription = null
)
Spacer(modifier = Modifier.width(8.dp))

4
app/src/main/java/chat/stoat/composables/screens/chat/ChannelHeader.kt
View File

@ -46,7 +46,7 @@ fun ChannelHeader(
onToggleDrawer()
}) {
Icon(
painter = painterResource(R.drawable.icn_menu_24dp),
painter = painterResource(R.drawable.ic_menu_24dp),
contentDescription = stringResource(R.string.menu)
)
}
@ -90,7 +90,7 @@ fun ChannelHeader(
Spacer(modifier = Modifier.width(4.dp))
Icon(
painter = painterResource(R.drawable.icn_keyboard_arrow_right_24dp),
painter = painterResource(R.drawable.ic_keyboard_arrow_right_24dp),
contentDescription = stringResource(R.string.menu),
modifier = Modifier
.size(18.dp)

10
app/src/main/java/chat/stoat/composables/screens/chat/ChannelIcon.kt
View File

@ -16,7 +16,7 @@ fun ChannelIcon(channelType: ChannelType, modifier: Modifier = Modifier) {
when (channelType) {
ChannelType.TextChannel -> {
Icon(
painter = painterResource(R.drawable.icn_grid_3x3_24dp),
painter = painterResource(R.drawable.ic_grid_3x3_24dp),
contentDescription = stringResource(R.string.channel_text),
modifier = modifier
)
@ -24,7 +24,7 @@ fun ChannelIcon(channelType: ChannelType, modifier: Modifier = Modifier) {
ChannelType.VoiceChannel -> {
Icon(
painter = painterResource(R.drawable.icn_volume_up_24dp),
painter = painterResource(R.drawable.ic_volume_up_24dp),
contentDescription = stringResource(R.string.channel_voice),
modifier = modifier
)
@ -32,7 +32,7 @@ fun ChannelIcon(channelType: ChannelType, modifier: Modifier = Modifier) {
ChannelType.SavedMessages -> {
Icon(
painter = painterResource(R.drawable.icn_note_stack_24dp),
painter = painterResource(R.drawable.ic_note_stack_24dp),
contentDescription = stringResource(R.string.channel_notes),
modifier = modifier
)
@ -40,7 +40,7 @@ fun ChannelIcon(channelType: ChannelType, modifier: Modifier = Modifier) {
ChannelType.DirectMessage -> {
Icon(
painter = painterResource(R.drawable.icn_account_circle_24dp),
painter = painterResource(R.drawable.ic_account_circle_24dp),
contentDescription = stringResource(R.string.channel_dm),
modifier = modifier
)
@ -48,7 +48,7 @@ fun ChannelIcon(channelType: ChannelType, modifier: Modifier = Modifier) {
ChannelType.Group -> {
Icon(
painter = painterResource(R.drawable.icn_account_box_24dp),
painter = painterResource(R.drawable.ic_account_box_24dp),
contentDescription = stringResource(R.string.channel_group),
modifier = modifier
)

2
app/src/main/java/chat/stoat/composables/screens/chat/ReplyManager.kt
View File

@ -58,7 +58,7 @@ fun ManageableReply(reply: SendMessageReply, onToggleMention: () -> Unit, onRemo
verticalAlignment = Alignment.CenterVertically
) {
Icon(
painter = painterResource(R.drawable.icn_close_24dp),
painter = painterResource(R.drawable.ic_close_24dp),
contentDescription = stringResource(id = R.string.remove_reply_alt),
modifier = Modifier
.clip(MaterialTheme.shapes.small)

2
app/src/main/java/chat/stoat/composables/screens/chat/atoms/RegularMessage.kt
View File

@ -242,7 +242,7 @@ fun RegularMessage(
)
) {
Icon(
painter = painterResource(R.drawable.icn_reply_24dp),
painter = painterResource(R.drawable.ic_reply_24dp),
contentDescription = null,
modifier = Modifier.size(
min(

18
app/src/main/java/chat/stoat/composables/screens/chat/drawer/ChannelSideDrawer.kt
View File

@ -407,7 +407,7 @@ fun ChannelSideDrawer(
contentAlignment = Alignment.Center
) {
Icon(
painter = painterResource(R.drawable.icn_add_24dp),
painter = painterResource(R.drawable.ic_add_24dp),
contentDescription = stringResource(R.string.server_plus_alt)
)
}
@ -425,7 +425,7 @@ fun ChannelSideDrawer(
contentAlignment = Alignment.Center
) {
Icon(
painter = painterResource(R.drawable.icn_explore_24dp),
painter = painterResource(R.drawable.ic_explore_24dp),
contentDescription = stringResource(R.string.discover_alt)
)
}
@ -447,7 +447,7 @@ fun ChannelSideDrawer(
contentAlignment = Alignment.Center
) {
Icon(
painter = painterResource(R.drawable.icn_settings_24dp),
painter = painterResource(R.drawable.ic_settings_24dp),
contentDescription = stringResource(R.string.settings)
)
}
@ -521,7 +521,7 @@ fun ChannelSideDrawer(
if (server?.flags has ServerFlags.Official) {
Icon(
painter = painterResource(
id = R.drawable.icn_workspace_premium_24dp__fill
id = R.drawable.ic_workspace_premium_24dp__fill
),
contentDescription = stringResource(
R.string.server_flag_official
@ -534,7 +534,7 @@ fun ChannelSideDrawer(
if (server?.flags has ServerFlags.Verified) {
Icon(
painter = painterResource(
id = R.drawable.icn_verified_24dp__fill
id = R.drawable.ic_verified_24dp__fill
),
contentDescription = stringResource(
R.string.server_flag_verified
@ -561,7 +561,7 @@ fun ChannelSideDrawer(
server?.id?.let { srvId -> onShowServerContextSheet(srvId) }
}) {
Icon(
painter = painterResource(R.drawable.icn_more_vert_24dp),
painter = painterResource(R.drawable.ic_more_vert_24dp),
contentDescription = stringResource(R.string.menu),
tint = LocalContentColor.current
)
@ -625,7 +625,7 @@ fun ColumnScope.DirectMessagesChannelListRenderer(
name = stringResource(R.string.overview_screen_title),
channelType = ChannelType.TextChannel
),
iconType = ChannelItemIconType.Painter(painterResource(R.drawable.icn_star_shine_24dp)),
iconType = ChannelItemIconType.Painter(painterResource(R.drawable.ic_star_shine_24dp)),
isCurrent = currentDestination is ChatRouterDestination.Overview,
onDestinationChanged = {
onDestinationChanged(ChatRouterDestination.Overview)
@ -646,7 +646,7 @@ fun ColumnScope.DirectMessagesChannelListRenderer(
name = stringResource(R.string.friends),
channelType = ChannelType.TextChannel
),
iconType = ChannelItemIconType.Painter(painterResource(R.drawable.icn_group_24dp)),
iconType = ChannelItemIconType.Painter(painterResource(R.drawable.ic_group_24dp)),
isCurrent = currentDestination is ChatRouterDestination.Friends,
onDestinationChanged = {
onDestinationChanged(ChatRouterDestination.Friends)
@ -919,7 +919,7 @@ fun ChannelItem(
GeoStateProvider.geoState?.isAgeRestrictedGeo == true &&
channel.nsfw == true -> {
Icon(
painter = painterResource(R.drawable.icn_grid_3x3_off_24dp),
painter = painterResource(R.drawable.ic_grid_3x3_off_24dp),
contentDescription = stringResource(R.string.geogate_channel_icon_alt),
)
}

2
app/src/main/java/chat/stoat/composables/screens/chat/molecules/JoinVoiceChannelButton.kt
View File

@ -52,7 +52,7 @@ fun JoinVoiceChannelButton(channelId: String, modifier: Modifier = Modifier) {
)
} else {
Icon(
painter = painterResource(R.drawable.icn_voice_chat_24dp),
painter = painterResource(R.drawable.ic_voice_chat_24dp),
contentDescription = null,
modifier = Modifier.size(24.dp)
)

4
app/src/main/java/chat/stoat/composables/screens/settings/ServerOverview.kt
View File

@ -104,7 +104,7 @@ fun ServerOverview(server: Server) {
CompositionLocalProvider(LocalContentColor provides Color.White) {
if (server.flags has ServerFlags.Official) {
Icon(
painter = painterResource(id = R.drawable.icn_workspace_premium_24dp__fill),
painter = painterResource(id = R.drawable.ic_workspace_premium_24dp__fill),
contentDescription = stringResource(R.string.server_flag_official),
modifier = Modifier
.padding(end = 8.dp)
@ -113,7 +113,7 @@ fun ServerOverview(server: Server) {
}
if (server.flags has ServerFlags.Verified) {
Icon(
painter = painterResource(id = R.drawable.icn_verified_24dp__fill),
painter = painterResource(id = R.drawable.ic_verified_24dp__fill),
contentDescription = stringResource(R.string.server_flag_verified),
modifier = Modifier
.padding(end = 8.dp)

4
app/src/main/java/chat/stoat/composables/screens/settings/UserButtons.kt
View File

@ -118,7 +118,7 @@ fun UserButtons(
.weight(1f)
) {
Icon(
painter = painterResource(R.drawable.icn_smart_toy_24dp),
painter = painterResource(R.drawable.ic_smart_toy_24dp),
contentDescription = null
)
Text(
@ -334,7 +334,7 @@ fun UserButtons(
}
) {
Icon(
painter = painterResource(R.drawable.icn_more_vert_24dp),
painter = painterResource(R.drawable.ic_more_vert_24dp),
contentDescription = stringResource(R.string.menu)
)
}

2
app/src/main/java/chat/stoat/composables/settings/sessions/SessionItem.kt
View File

@ -54,7 +54,7 @@ fun SessionItem(
onLogout(session)
}) {
Icon(
painter = painterResource(R.drawable.icn_logout_24dp),
painter = painterResource(R.drawable.ic_logout_24dp),
contentDescription = stringResource(R.string.logout)
)
}

2
app/src/main/java/chat/stoat/composables/sheets/SheetSelection.kt
View File

@ -55,7 +55,7 @@ fun SheetSelection(
}
}
Icon(
painter = painterResource(R.drawable.icn_keyboard_arrow_right_24dp),
painter = painterResource(R.drawable.ic_keyboard_arrow_right_24dp),
contentDescription = null,
tint = arrowTint
)

8
app/src/main/java/chat/stoat/composables/voice/VoiceParticipant.kt
View File

@ -42,25 +42,25 @@ fun VoiceParticipant(
Row {
if (!state.isPublishing) {
Icon(
painter = painterResource(R.drawable.icn_mic_off_24dp),
painter = painterResource(R.drawable.ic_mic_off_24dp),
contentDescription = stringResource(R.string.voice_muted),
)
}
if (!state.isReceiving) {
Icon(
painter = painterResource(R.drawable.icn_headset_off_24dp),
painter = painterResource(R.drawable.ic_headset_off_24dp),
contentDescription = stringResource(R.string.voice_deafened),
)
}
if (state.camera) {
Icon(
painter = painterResource(R.drawable.icn_videocam_24dp),
painter = painterResource(R.drawable.ic_videocam_24dp),
contentDescription = stringResource(R.string.voice_camera_on),
)
}
if (state.screensharing) {
Icon(
painter = painterResource(R.drawable.icn_screen_share_24dp),
painter = painterResource(R.drawable.ic_screen_share_24dp),
contentDescription = stringResource(R.string.voice_screen_sharing),
tint = MaterialTheme.colorScheme.primary
)

4
app/src/main/java/chat/stoat/composables/voice/VoicePermissionSwitch.kt
View File

@ -84,7 +84,7 @@ fun VoicePermissionSwitch(onCancel: () -> Unit, onPermissionGranted: @Composable
verticalAlignment = Alignment.CenterVertically
) {
Icon(
painter = painterResource(R.drawable.icn_mic_24dp),
painter = painterResource(R.drawable.ic_mic_24dp),
contentDescription = null
)
Text(
@ -99,7 +99,7 @@ fun VoicePermissionSwitch(onCancel: () -> Unit, onPermissionGranted: @Composable
verticalAlignment = Alignment.CenterVertically
) {
Icon(
painter = painterResource(R.drawable.icn_videocam_24dp),
painter = painterResource(R.drawable.ic_videocam_24dp),
contentDescription = null
)
Text(

16
app/src/main/java/chat/stoat/composables/voice/VoiceSheet.kt
View File

@ -177,10 +177,10 @@ fun VoiceSheet(
Icon(
painter = painterResource(
when (roomState) {
Room.State.CONNECTING -> R.drawable.icn_sprint_24dp
Room.State.CONNECTED -> R.drawable.icn_wifi_tethering_24dp
Room.State.DISCONNECTED -> R.drawable.icn_wifi_tethering_error_24dp
Room.State.RECONNECTING -> R.drawable.icn_sprint_24dp
Room.State.CONNECTING -> R.drawable.ic_sprint_24dp
Room.State.CONNECTED -> R.drawable.ic_wifi_tethering_24dp
Room.State.DISCONNECTED -> R.drawable.ic_wifi_tethering_error_24dp
Room.State.RECONNECTING -> R.drawable.ic_sprint_24dp
}
),
contentDescription = null
@ -237,7 +237,7 @@ fun VoiceSheet(
.height(64.dp)
) {
Icon(
painter = painterResource(R.drawable.icn_mic_off_24dp),
painter = painterResource(R.drawable.ic_mic_off_24dp),
contentDescription = "TODO change this string to res"
)
}
@ -255,7 +255,7 @@ fun VoiceSheet(
.height(64.dp)
) {
Icon(
painter = painterResource(R.drawable.icn_videocam_off_24dp),
painter = painterResource(R.drawable.ic_videocam_off_24dp),
contentDescription = "TODO change this string to res"
)
}
@ -273,7 +273,7 @@ fun VoiceSheet(
.height(64.dp)
) {
Icon(
painter = painterResource(R.drawable.icn_mobile_share_24px),
painter = painterResource(R.drawable.ic_mobile_share_24px),
contentDescription = "TODO change this string to res"
)
}
@ -293,7 +293,7 @@ fun VoiceSheet(
.height(64.dp)
) {
Icon(
painter = painterResource(R.drawable.icn_call_end_24dp__fill),
painter = painterResource(R.drawable.ic_call_end_24dp__fill),
contentDescription = stringResource(R.string.voice_action_disconnect)
)
}

2
app/src/main/java/chat/stoat/screens/about/AboutScreen.kt
View File

@ -166,7 +166,7 @@ fun AboutScreen(navController: NavController, viewModel: AboutViewModel = viewMo
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}

2
app/src/main/java/chat/stoat/screens/about/AttributionScreen.kt
View File

@ -170,7 +170,7 @@ fun AttributionScreen(navController: NavController) {
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}

2
app/src/main/java/chat/stoat/screens/chat/ChatRouterScreen.kt
View File

@ -640,7 +640,7 @@ fun ChatRouterScreen(
},
icon = {
Icon(
painter = painterResource(R.drawable.icn_lock_24dp),
painter = painterResource(R.drawable.ic_lock_24dp),
contentDescription = null, // decorative
tint = MaterialTheme.colorScheme.primary
)

4
app/src/main/java/chat/stoat/screens/chat/dialogs/safety/ReportMessageDialog.kt
View File

@ -270,7 +270,7 @@ fun ReportMessageDialog(onDismiss: () -> Unit, messageId: String) {
},
icon = {
Icon(
painter = painterResource(R.drawable.icn_check_24dp),
painter = painterResource(R.drawable.ic_check_24dp),
contentDescription = null, // decorative
tint = MaterialTheme.colorScheme.primary
)
@ -337,7 +337,7 @@ fun ReportMessageDialog(onDismiss: () -> Unit, messageId: String) {
},
icon = {
Icon(
painter = painterResource(R.drawable.icn_error_24dp),
painter = painterResource(R.drawable.ic_error_24dp),
contentDescription = null, // decorative
tint = MaterialTheme.colorScheme.primary
)

4
app/src/main/java/chat/stoat/screens/chat/dialogs/safety/ReportServerDialog.kt
View File

@ -234,7 +234,7 @@ fun ReportServerDialog(onDismiss: () -> Unit, serverId: String) {
},
icon = {
Icon(
painter = painterResource(R.drawable.icn_check_24dp),
painter = painterResource(R.drawable.ic_check_24dp),
contentDescription = null, // decorative
tint = MaterialTheme.colorScheme.primary
)
@ -279,7 +279,7 @@ fun ReportServerDialog(onDismiss: () -> Unit, serverId: String) {
},
icon = {
Icon(
painter = painterResource(R.drawable.icn_close_24dp),
painter = painterResource(R.drawable.ic_close_24dp),
contentDescription = null, // decorative
tint = MaterialTheme.colorScheme.primary
)

4
app/src/main/java/chat/stoat/screens/chat/dialogs/safety/ReportUserDialog.kt
View File

@ -232,7 +232,7 @@ fun ReportUserDialog(onDismiss: () -> Unit, userId: String) {
},
icon = {
Icon(
painter = painterResource(R.drawable.icn_check_24dp),
painter = painterResource(R.drawable.ic_check_24dp),
contentDescription = null, // decorative
tint = MaterialTheme.colorScheme.primary
)
@ -299,7 +299,7 @@ fun ReportUserDialog(onDismiss: () -> Unit, userId: String) {
},
icon = {
Icon(
painter = painterResource(R.drawable.icn_error_24dp),
painter = painterResource(R.drawable.ic_error_24dp),
contentDescription = null, // decorative
tint = MaterialTheme.colorScheme.primary
)

2
app/src/main/java/chat/stoat/screens/chat/standalone/CatchUpScreen.kt
View File

@ -136,7 +136,7 @@ fun CatchUpScreen(navController: NavController, viewModel: CatchUpScreenViewMode
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}

10
app/src/main/java/chat/stoat/screens/chat/views/FriendsScreen.kt
View File

@ -498,7 +498,7 @@ fun FriendsScreen(topNav: NavController, useDrawer: Boolean, onDrawerClicked: ()
onDrawerClicked()
}) {
Icon(
painter = painterResource(R.drawable.icn_menu_24dp),
painter = painterResource(R.drawable.ic_menu_24dp),
contentDescription = stringResource(id = R.string.menu)
)
}
@ -509,7 +509,7 @@ fun FriendsScreen(topNav: NavController, useDrawer: Boolean, onDrawerClicked: ()
overflowMenuShown = true
}) {
Icon(
painter = painterResource(R.drawable.icn_more_vert_24dp),
painter = painterResource(R.drawable.ic_more_vert_24dp),
contentDescription = stringResource(R.string.menu)
)
}
@ -718,7 +718,7 @@ fun FriendsScreen(topNav: NavController, useDrawer: Boolean, onDrawerClicked: ()
},
icon = {
Icon(
painterResource(R.drawable.icn_group_add_24dp),
painterResource(R.drawable.ic_group_add_24dp),
contentDescription = null
)
},
@ -732,7 +732,7 @@ fun FriendsScreen(topNav: NavController, useDrawer: Boolean, onDrawerClicked: ()
},
icon = {
Icon(
painterResource(R.drawable.icn_qr_code_scanner_24dp),
painterResource(R.drawable.ic_qr_code_scanner_24dp),
contentDescription = null
)
},
@ -746,7 +746,7 @@ fun FriendsScreen(topNav: NavController, useDrawer: Boolean, onDrawerClicked: ()
},
icon = {
Icon(
painterResource(R.drawable.icn_tag_24dp),
painterResource(R.drawable.ic_tag_24dp),
contentDescription = null
)
},

2
app/src/main/java/chat/stoat/screens/chat/views/NoCurrentChannelScreen.kt
View File

@ -52,7 +52,7 @@ fun NoCurrentChannelScreen(useDrawer: Boolean, onDrawerClicked: () -> Unit) {
onDrawerClicked()
}) {
Icon(
painter = painterResource(R.drawable.icn_menu_24dp),
painter = painterResource(R.drawable.ic_menu_24dp),
contentDescription = stringResource(id = R.string.menu)
)
}

16
app/src/main/java/chat/stoat/screens/chat/views/OverviewScreen.kt
View File

@ -153,7 +153,7 @@ fun OverviewScreen(
onDrawerClicked()
}) {
Icon(
painter = painterResource(R.drawable.icn_menu_24dp),
painter = painterResource(R.drawable.ic_menu_24dp),
contentDescription = stringResource(id = R.string.menu)
)
}
@ -171,7 +171,7 @@ fun OverviewScreen(
NonIdealState(
icon = { size ->
Icon(
painter = painterResource(R.drawable.icn_error_24dp),
painter = painterResource(R.drawable.ic_error_24dp),
contentDescription = null,
modifier = Modifier.size(size)
)
@ -245,8 +245,8 @@ fun OverviewScreen(
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Icon(
painter = if (hasUnreads) painterResource(R.drawable.icn_move_to_inbox_24dp) else painterResource(
R.drawable.icn_inbox_24dp
painter = if (hasUnreads) painterResource(R.drawable.ic_move_to_inbox_24dp) else painterResource(
R.drawable.ic_inbox_24dp
),
contentDescription = null,
modifier = Modifier.size(22.dp)
@ -292,7 +292,7 @@ fun OverviewScreen(
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Icon(
painter = painterResource(R.drawable.icn_settings_24dp),
painter = painterResource(R.drawable.ic_settings_24dp),
contentDescription = null,
modifier = Modifier.size(22.dp)
)
@ -315,7 +315,7 @@ fun OverviewScreen(
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Icon(
painter = painterResource(R.drawable.icn_ios_share_24dp),
painter = painterResource(R.drawable.ic_ios_share_24dp),
contentDescription = null,
modifier = Modifier.size(22.dp)
)
@ -339,7 +339,7 @@ fun OverviewScreen(
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Icon(
painter = painterResource(R.drawable.icn_wand_shine_24dp),
painter = painterResource(R.drawable.ic_wand_shine_24dp),
contentDescription = null,
modifier = Modifier.size(22.dp)
)
@ -367,7 +367,7 @@ fun OverviewScreen(
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Icon(
painter = painterResource(R.drawable.icn_star_shine_24dp),
painter = painterResource(R.drawable.ic_star_shine_24dp),
contentDescription = null,
modifier = Modifier.size(22.dp)
)

20
app/src/main/java/chat/stoat/screens/chat/views/channel/ChannelScreen.kt
View File

@ -612,7 +612,7 @@ fun ChannelScreen(
}
Icon(
painter = painterResource(R.drawable.icn_keyboard_arrow_right_24dp),
painter = painterResource(R.drawable.ic_keyboard_arrow_right_24dp),
contentDescription = null,
modifier = Modifier
.size(16.dp)
@ -626,7 +626,7 @@ fun ChannelScreen(
if (useDrawer) {
IconButton(onClick = onToggleDrawer) {
Icon(
painter = painterResource(R.drawable.icn_menu_24dp),
painter = painterResource(R.drawable.ic_menu_24dp),
contentDescription = stringResource(id = R.string.menu)
)
}
@ -634,7 +634,7 @@ fun ChannelScreen(
if (useBackButton) {
IconButton(onClick = backButtonAction ?: {}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}
@ -872,7 +872,7 @@ fun ChannelScreen(
containerColor = MaterialTheme.colorScheme.surfaceVariant
) {
Icon(
painter = painterResource(R.drawable.icn_south_24dp),
painter = painterResource(R.drawable.ic_south_24dp),
contentDescription = stringResource(R.string.scroll_to_bottom)
)
}
@ -917,7 +917,7 @@ fun ChannelScreen(
) {
with(LocalDensity.current) {
Image(
painterResource(R.drawable.icn_action_key_24dp),
painterResource(R.drawable.ic_action_key_24dp),
contentDescription = null,
colorFilter = ColorFilter.tint(
LocalContentColor.current
@ -1028,13 +1028,13 @@ fun ChannelScreen(
},
leadingIcon = {
Icon(
painter = painterResource(R.drawable.icn_edit_24dp),
painter = painterResource(R.drawable.ic_edit_24dp),
contentDescription = null
)
},
trailingIcon = {
Icon(
painter = painterResource(R.drawable.icn_close_24dp),
painter = painterResource(R.drawable.ic_close_24dp),
contentDescription = stringResource(R.string.message_field_editing_message_cancel_alt),
tint = MaterialTheme.colorScheme.onSurface,
modifier = Modifier.alpha(0.8f)
@ -1104,7 +1104,7 @@ fun ChannelScreen(
DropdownMenuItem(
leadingIcon = {
Icon(
painter = painterResource(R.drawable.icn_attach_file_24dp),
painter = painterResource(R.drawable.ic_attach_file_24dp),
contentDescription = null // Provided by text below
)
},
@ -1118,7 +1118,7 @@ fun ChannelScreen(
DropdownMenuItem(
leadingIcon = {
Icon(
painter = painterResource(R.drawable.icn_camera_24dp),
painter = painterResource(R.drawable.ic_camera_24dp),
contentDescription = null // Provided by text below
)
},
@ -1132,7 +1132,7 @@ fun ChannelScreen(
DropdownMenuItem(
leadingIcon = {
Icon(
painter = painterResource(R.drawable.icn_photo_library_24dp),
painter = painterResource(R.drawable.ic_photo_library_24dp),
contentDescription = null // Provided by text below
)
},

2
app/src/main/java/chat/stoat/screens/chat/views/channel/ChannelScreenAgeGate.kt
View File

@ -124,7 +124,7 @@ fun ChannelScreenAgeGate(
verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically)
) {
Icon(
painter = painterResource(R.drawable.icn_front_hand_24dp),
painter = painterResource(R.drawable.ic_front_hand_24dp),
contentDescription = null,
modifier = Modifier.size(48.dp),
)

6
app/src/main/java/chat/stoat/screens/create/CreateGroupScreen.kt
View File

@ -121,7 +121,7 @@ fun CreateGroupScreen(
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}
@ -136,7 +136,7 @@ fun CreateGroupScreen(
) {
FloatingActionButton(onClick = { viewModel.createGroup(navController::popBackStack) }) {
Icon(
painter = painterResource(R.drawable.icn_check_24dp),
painter = painterResource(R.drawable.ic_check_24dp),
contentDescription = stringResource(R.string.create_group_action)
)
}
@ -177,7 +177,7 @@ fun CreateGroupScreen(
onValueChange = { viewModel.updateFriendSearchQuery(it) },
leadingIcon = {
Icon(
painter = painterResource(R.drawable.icn_search_24dp),
painter = painterResource(R.drawable.ic_search_24dp),
contentDescription = null
)
},

8
app/src/main/java/chat/stoat/screens/labs/LabsHomeScreen.kt
View File

@ -59,7 +59,7 @@ fun LabsHomeScreen(navController: NavController, topNav: NavController) {
topNav.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = "Back"
)
}
@ -73,7 +73,7 @@ fun LabsHomeScreen(navController: NavController, topNav: NavController) {
onClick = { currentTab.value = LabsHomeScreenTab.Home },
icon = {
Icon(
painter = painterResource(R.drawable.icn_home_24dp),
painter = painterResource(R.drawable.ic_home_24dp),
contentDescription = null,
)
},
@ -86,7 +86,7 @@ fun LabsHomeScreen(navController: NavController, topNav: NavController) {
onClick = { currentTab.value = LabsHomeScreenTab.Mockups },
icon = {
Icon(
painter = painterResource(R.drawable.icn_menu_24dp),
painter = painterResource(R.drawable.ic_menu_24dp),
contentDescription = null,
)
},
@ -99,7 +99,7 @@ fun LabsHomeScreen(navController: NavController, topNav: NavController) {
onClick = { currentTab.value = LabsHomeScreenTab.Sandboxes },
icon = {
Icon(
painter = painterResource(R.drawable.icn_play_arrow_24dp),
painter = painterResource(R.drawable.ic_play_arrow_24dp),
contentDescription = null,
)
},

4
app/src/main/java/chat/stoat/screens/login/LoginScreen.kt
View File

@ -252,14 +252,14 @@ fun LoginScreen(navController: NavController, viewModel: LoginViewModel = hiltVi
when {
showPassword.value -> {
Icon(
painter = painterResource(R.drawable.icn_visibility_off_24dp),
painter = painterResource(R.drawable.ic_visibility_off_24dp),
contentDescription = stringResource(R.string.hide_password)
)
}
else -> {
Icon(
painter = painterResource(R.drawable.icn_visibility_24dp),
painter = painterResource(R.drawable.ic_visibility_24dp),
contentDescription = stringResource(R.string.show_password)
)
}

2
app/src/main/java/chat/stoat/screens/main/ConversationsScreen.kt
View File

@ -103,7 +103,7 @@ fun ConversationsScreen(navController: NavController) {
}
Badge {
Icon(
painter = painterResource(R.drawable.icn_keep_24dp),
painter = painterResource(R.drawable.ic_keep_24dp),
contentDescription = null,
modifier = Modifier.size(12.dp)
)

10
app/src/main/java/chat/stoat/screens/main/MainScreen.kt
View File

@ -38,7 +38,7 @@ fun MainScreen(navController: NavController) {
icon = {
Icon(
painter = painterResource(
R.drawable.icn_tag_24dp
R.drawable.ic_tag_24dp
),
contentDescription = null,
)
@ -54,9 +54,9 @@ fun MainScreen(navController: NavController) {
Icon(
painter = painterResource(
if (currentTab == MainScreenTab.Conversations) {
R.drawable.icn_forum_24dp__fill
R.drawable.ic_forum_24dp__fill
} else {
R.drawable.icn_forum_24dp
R.drawable.ic_forum_24dp
}
),
contentDescription = null,
@ -73,9 +73,9 @@ fun MainScreen(navController: NavController) {
Icon(
painter = painterResource(
if (currentTab == MainScreenTab.Overview) {
R.drawable.icn_star_shine_24dp__fill
R.drawable.ic_star_shine_24dp__fill
} else {
R.drawable.icn_star_shine_24dp
R.drawable.ic_star_shine_24dp
}
),
contentDescription = null,

2
app/src/main/java/chat/stoat/screens/services/DiscoverScreen.kt
View File

@ -36,7 +36,7 @@ fun DiscoverScreen(navController: NavController) {
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}

8
app/src/main/java/chat/stoat/screens/settings/AppearanceSettingsScreen.kt
View File

@ -311,7 +311,7 @@ fun AppearanceSettingsScreen(
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}
@ -483,7 +483,7 @@ fun AppearanceSettingsScreen(
verticalAlignment = Alignment.CenterVertically
) {
Icon(
painter = painterResource(R.drawable.icn_keyboard_arrow_right_24dp),
painter = painterResource(R.drawable.ic_keyboard_arrow_right_24dp),
contentDescription = null,
modifier = Modifier
.padding(start = 20.dp, end = 4.dp)
@ -515,7 +515,7 @@ fun AppearanceSettingsScreen(
modifier = Modifier.weight(1f)
) {
Icon(
painter = painterResource(R.drawable.icn_file_open_24dp),
painter = painterResource(R.drawable.ic_file_open_24dp),
contentDescription = null
)
@ -533,7 +533,7 @@ fun AppearanceSettingsScreen(
modifier = Modifier.weight(1f)
) {
Icon(
painter = painterResource(R.drawable.icn_file_export_24dp),
painter = painterResource(R.drawable.ic_file_export_24dp),
contentDescription = null
)

2
app/src/main/java/chat/stoat/screens/settings/ChangelogsScreen.kt
View File

@ -135,7 +135,7 @@ fun ChangelogsSettingsScreen(
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}

2
app/src/main/java/chat/stoat/screens/settings/ChatSettingsScreen.kt
View File

@ -86,7 +86,7 @@ fun ChatSettingsScreen(
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}

2
app/src/main/java/chat/stoat/screens/settings/DebugSettingsScreen.kt
View File

@ -201,7 +201,7 @@ fun DebugSettingsScreen(
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}

2
app/src/main/java/chat/stoat/screens/settings/LanguagePickerSettingsScreen.kt
View File

@ -80,7 +80,7 @@ fun LanguagePickerSettingsScreen(
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}

4
app/src/main/java/chat/stoat/screens/settings/ProfileSettngsScreen.kt
View File

@ -258,7 +258,7 @@ fun ProfileSettingsScreen(
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}
@ -424,7 +424,7 @@ fun ProfileSettingsScreen(
modifier = Modifier.fillMaxWidth()
) {
Icon(
painter = painterResource(R.drawable.icn_check_24dp),
painter = painterResource(R.drawable.ic_check_24dp),
contentDescription = null
)

2
app/src/main/java/chat/stoat/screens/settings/SessionSettngsScreen.kt
View File

@ -153,7 +153,7 @@ fun SessionSettingsScreen(
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}

26
app/src/main/java/chat/stoat/screens/settings/SettingsScreen.kt
View File

@ -83,7 +83,7 @@ fun SettingsScreen(
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}
@ -115,7 +115,7 @@ fun SettingsScreen(
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(R.drawable.icn_id_card_24dp),
painter = painterResource(R.drawable.ic_id_card_24dp),
contentDescription = null,
)
}
@ -136,7 +136,7 @@ fun SettingsScreen(
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(R.drawable.icn_devices_24dp),
painter = painterResource(R.drawable.ic_devices_24dp),
contentDescription = null,
)
}
@ -161,7 +161,7 @@ fun SettingsScreen(
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(R.drawable.icn_palette_24dp),
painter = painterResource(R.drawable.ic_palette_24dp),
contentDescription = null,
)
}
@ -182,7 +182,7 @@ fun SettingsScreen(
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(R.drawable.icn_language_24dp),
painter = painterResource(R.drawable.ic_language_24dp),
contentDescription = null,
)
}
@ -203,7 +203,7 @@ fun SettingsScreen(
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(R.drawable.icn_chat_24dp),
painter = painterResource(R.drawable.ic_chat_24dp),
contentDescription = null,
)
}
@ -228,7 +228,7 @@ fun SettingsScreen(
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(R.drawable.icn_info_24dp),
painter = painterResource(R.drawable.ic_info_24dp),
contentDescription = null,
)
}
@ -250,7 +250,7 @@ fun SettingsScreen(
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(R.drawable.icn_sign_language_24dp),
painter = painterResource(R.drawable.ic_sign_language_24dp),
contentDescription = null,
)
}
@ -273,7 +273,7 @@ fun SettingsScreen(
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(R.drawable.icn_sign_language_24dp),
painter = painterResource(R.drawable.ic_sign_language_24dp),
contentDescription = null,
)
}
@ -296,7 +296,7 @@ fun SettingsScreen(
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(R.drawable.icn_brand_family_24dp),
painter = painterResource(R.drawable.ic_brand_family_24dp),
contentDescription = null,
)
}
@ -327,7 +327,7 @@ fun SettingsScreen(
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(R.drawable.icn_wand_shine_24dp),
painter = painterResource(R.drawable.ic_wand_shine_24dp),
contentDescription = null,
)
}
@ -353,7 +353,7 @@ fun SettingsScreen(
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(R.drawable.icn_feedback_24dp),
painter = painterResource(R.drawable.ic_feedback_24dp),
contentDescription = null,
)
}
@ -382,7 +382,7 @@ fun SettingsScreen(
leadingContent = {
SettingsIcon(danger = true) {
Icon(
painter = painterResource(R.drawable.icn_logout_24dp),
painter = painterResource(R.drawable.ic_logout_24dp),
contentDescription = null,
)
}

8
app/src/main/java/chat/stoat/screens/settings/channel/ChannelSettingsHome.kt
View File

@ -110,7 +110,7 @@ fun ChannelSettingsHome(navController: NavController, channelId: String) {
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}
@ -135,7 +135,7 @@ fun ChannelSettingsHome(navController: NavController, channelId: String) {
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(R.drawable.icn_info_24dp),
painter = painterResource(R.drawable.ic_info_24dp),
contentDescription = null,
)
}
@ -159,7 +159,7 @@ fun ChannelSettingsHome(navController: NavController, channelId: String) {
leadingContent = {
SettingsIcon {
Icon(
painter = painterResource(id = R.drawable.icn_page_info_24dp),
painter = painterResource(id = R.drawable.ic_page_info_24dp),
contentDescription = null,
)
}
@ -184,7 +184,7 @@ fun ChannelSettingsHome(navController: NavController, channelId: String) {
leadingContent = {
SettingsIcon(danger = true) {
Icon(
painter = painterResource(R.drawable.icn_delete_24dp),
painter = painterResource(R.drawable.ic_delete_24dp),
contentDescription = null,
)
}

4
app/src/main/java/chat/stoat/screens/settings/channel/ChannelSettingsOverview.kt
View File

@ -298,7 +298,7 @@ fun ChannelSettingsOverview(
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}
@ -313,7 +313,7 @@ fun ChannelSettingsOverview(
) {
FloatingActionButton(onClick = { viewModel.updateChannel() }) {
Icon(
painter = painterResource(R.drawable.icn_check_24dp),
painter = painterResource(R.drawable.ic_check_24dp),
contentDescription = stringResource(R.string.channel_settings_overview_save)
)
}

2
app/src/main/java/chat/stoat/screens/settings/channel/ChannelSettingsPermissions.kt
View File

@ -49,7 +49,7 @@ fun ChannelSettingsPermissions(navController: NavController, channelId: String)
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}

2
app/src/main/java/chat/stoat/settings/dsl/SettingsPage.kt
View File

@ -106,7 +106,7 @@ fun SettingsPage(
navController.popBackStack()
}) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back)
)
}

4
app/src/main/java/chat/stoat/sheets/AddServerSheet.kt
View File

@ -218,7 +218,7 @@ fun AddServerSheet(onDismiss: () -> Unit) {
}
) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back),
)
}
@ -371,7 +371,7 @@ fun AddServerSheet(onDismiss: () -> Unit) {
}
) {
Icon(
painter = painterResource(R.drawable.icn_arrow_back_24dp),
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = stringResource(id = R.string.back),
)
}

4
app/src/main/java/chat/stoat/sheets/ChannelContextSheet.kt
View File

@ -51,7 +51,7 @@ fun ChannelContextSheet(channelId: String, onHideSheet: suspend () -> Unit) {
},
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_identifier_copy_24dp),
painter = painterResource(id = R.drawable.ic_identifier_copy_24dp),
contentDescription = null
)
},
@ -82,7 +82,7 @@ fun ChannelContextSheet(channelId: String, onHideSheet: suspend () -> Unit) {
},
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_mark_chat_read_24dp),
painter = painterResource(id = R.drawable.ic_mark_chat_read_24dp),
contentDescription = null
)
},

10
app/src/main/java/chat/stoat/sheets/ChannelInfoSheet.kt
View File

@ -124,7 +124,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
},
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_list_24dp),
painter = painterResource(R.drawable.ic_list_24dp),
contentDescription = null
)
},
@ -153,7 +153,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
},
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_add_24dp),
painter = painterResource(R.drawable.ic_add_24dp),
contentDescription = null
)
},
@ -172,7 +172,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
},
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_add_24dp),
painter = painterResource(R.drawable.ic_add_24dp),
contentDescription = null
)
},
@ -192,7 +192,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
},
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_notification_settings_24dp),
painter = painterResource(R.drawable.ic_notification_settings_24dp),
contentDescription = null
)
},
@ -211,7 +211,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
},
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_settings_24dp),
painter = painterResource(R.drawable.ic_settings_24dp),
contentDescription = null
)
},

2
app/src/main/java/chat/stoat/sheets/EmoteInfoSheet.kt
View File

@ -107,7 +107,7 @@ fun EmoteInfoSheet(id: String, onDismiss: () -> Unit) {
},
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_content_copy_24dp),
painter = painterResource(R.drawable.ic_content_copy_24dp),
contentDescription = null
)
},

4
app/src/main/java/chat/stoat/sheets/LinkInfoSheet.kt
View File

@ -81,7 +81,7 @@ fun LinkInfoSheet(url: String, onDismiss: () -> Unit) {
},
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_open_in_browser_24dp),
painter = painterResource(R.drawable.ic_open_in_browser_24dp),
contentDescription = null
)
},
@ -112,7 +112,7 @@ fun LinkInfoSheet(url: String, onDismiss: () -> Unit) {
},
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_content_copy_24dp),
painter = painterResource(R.drawable.ic_content_copy_24dp),
contentDescription = null
)
},

6
app/src/main/java/chat/stoat/sheets/MemberContextSheet.kt
View File

@ -60,7 +60,7 @@ fun ColumnScope.GroupDMMemberContextSheet(
leadingContent = {
CompositionLocalProvider(value = LocalContentColor provides MaterialTheme.colorScheme.error) {
Icon(
painter = painterResource(R.drawable.icn_person_off_24dp),
painter = painterResource(R.drawable.ic_person_off_24dp),
contentDescription = null
)
}
@ -82,7 +82,7 @@ fun ColumnScope.GroupDMMemberContextSheet(
},
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_identifier_copy_24dp),
painter = painterResource(R.drawable.ic_identifier_copy_24dp),
contentDescription = null
)
},
@ -132,7 +132,7 @@ fun ColumnScope.ServerMemberContextSheet(
},
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_identifier_copy_24dp),
painter = painterResource(R.drawable.ic_identifier_copy_24dp),
contentDescription = null
)
},

22
app/src/main/java/chat/stoat/sheets/MessageContextSheet.kt
View File

@ -95,7 +95,7 @@ fun MessageContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_content_copy_24dp),
painter = painterResource(id = R.drawable.ic_content_copy_24dp),
contentDescription = null
)
},
@ -141,7 +141,7 @@ fun MessageContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_link_24dp),
painter = painterResource(id = R.drawable.ic_link_24dp),
contentDescription = null
)
},
@ -201,7 +201,7 @@ fun MessageContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_identifier_copy_24dp),
painter = painterResource(id = R.drawable.ic_identifier_copy_24dp),
contentDescription = null
)
},
@ -341,7 +341,7 @@ fun MessageContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_reply_24dp),
painter = painterResource(id = R.drawable.ic_reply_24dp),
contentDescription = null
)
},
@ -361,7 +361,7 @@ fun MessageContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_add_reaction_24dp),
painter = painterResource(id = R.drawable.ic_add_reaction_24dp),
contentDescription = null
)
},
@ -379,7 +379,7 @@ fun MessageContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_edit_24dp),
painter = painterResource(R.drawable.ic_edit_24dp),
contentDescription = null
)
},
@ -400,7 +400,7 @@ fun MessageContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_visibility_off_24dp),
painter = painterResource(id = R.drawable.ic_visibility_off_24dp),
contentDescription = null
)
},
@ -426,7 +426,7 @@ fun MessageContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_account_tree_24dp),
painter = painterResource(id = R.drawable.ic_account_tree_24dp),
contentDescription = null
)
},
@ -445,7 +445,7 @@ fun MessageContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_ios_share_24dp),
painter = painterResource(id = R.drawable.ic_ios_share_24dp),
contentDescription = null,
)
},
@ -471,7 +471,7 @@ fun MessageContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_delete_24dp),
painter = painterResource(R.drawable.ic_delete_24dp),
contentDescription = null
)
},
@ -491,7 +491,7 @@ fun MessageContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_report_24dp),
painter = painterResource(id = R.drawable.ic_report_24dp),
contentDescription = null
)
},

8
app/src/main/java/chat/stoat/sheets/ServerContextSheet.kt
View File

@ -208,7 +208,7 @@ fun ServerContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_identifier_copy_24dp),
painter = painterResource(id = R.drawable.ic_identifier_copy_24dp),
contentDescription = null
)
},
@ -239,7 +239,7 @@ fun ServerContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_mark_chat_read_24dp),
painter = painterResource(id = R.drawable.ic_mark_chat_read_24dp),
contentDescription = null
)
},
@ -262,7 +262,7 @@ fun ServerContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_report_24dp),
painter = painterResource(id = R.drawable.ic_report_24dp),
contentDescription = null
)
},
@ -280,7 +280,7 @@ fun ServerContextSheet(
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.icn_door_open_24dp),
painter = painterResource(id = R.drawable.ic_door_open_24dp),
contentDescription = null,
)
},

4
app/src/main/java/chat/stoat/sheets/StatusSheet.kt
View File

@ -223,7 +223,7 @@ fun StatusSheet(onBeforeNavigation: () -> Unit, onGoSettings: () -> Unit) {
)
Icon(
painter = painterResource(R.drawable.icn_edit_24dp),
painter = painterResource(R.drawable.ic_edit_24dp),
contentDescription = null,
modifier = Modifier.padding(16.dp)
)
@ -233,7 +233,7 @@ fun StatusSheet(onBeforeNavigation: () -> Unit, onGoSettings: () -> Unit) {
SheetButton(
leadingContent = {
Icon(
painter = painterResource(R.drawable.icn_settings_24dp),
painter = painterResource(R.drawable.ic_settings_24dp),
contentDescription = null
)
},

4
app/src/main/java/chat/stoat/sheets/UserCardSheet.kt
View File

@ -209,7 +209,7 @@ fun UserCardSheet(user: User?) {
modifier = Modifier.weight(1f)
) {
Icon(
painter = painterResource(R.drawable.icn_ios_share_24dp),
painter = painterResource(R.drawable.ic_ios_share_24dp),
contentDescription = null
)
Spacer(modifier = Modifier.width(8.dp))
@ -229,7 +229,7 @@ fun UserCardSheet(user: User?) {
modifier = Modifier.weight(1f)
) {
Icon(
painter = painterResource(R.drawable.icn_content_copy_24dp),
painter = painterResource(R.drawable.ic_content_copy_24dp),
contentDescription = null
)
Spacer(modifier = Modifier.width(8.dp))

10
app/src/main/java/chat/stoat/sheets/UserInfoSheet.kt
View File

@ -90,7 +90,7 @@ fun UserInfoSheet(
NonIdealState(
icon = {
Icon(
painter = painterResource(R.drawable.icn_error_24dp),
painter = painterResource(R.drawable.ic_error_24dp),
contentDescription = null,
modifier = Modifier.size(it)
)
@ -153,7 +153,7 @@ fun UserInfoSheet(
onClick = { showServerIdentityOptions = true },
) {
Icon(
painter = painterResource(R.drawable.icn_psychology_alt_24dp),
painter = painterResource(R.drawable.ic_psychology_alt_24dp),
contentDescription = null
)
}
@ -164,7 +164,7 @@ fun UserInfoSheet(
onClick = { showUserCard = true },
) {
Icon(
painter = painterResource(R.drawable.icn_badge_24dp),
painter = painterResource(R.drawable.ic_badge_24dp),
contentDescription = null
)
}
@ -360,7 +360,7 @@ fun UserInfoSheet(
)
} ?: run {
Icon(
painter = painterResource(id = R.drawable.icn_error_24dp),
painter = painterResource(id = R.drawable.ic_error_24dp),
contentDescription = null
)
Spacer(modifier = Modifier.width(8.dp))
@ -380,7 +380,7 @@ fun UserInfoSheet(
NonIdealState(
icon = {
Icon(
painter = painterResource(R.drawable.icn_error_24dp),
painter = painterResource(R.drawable.ic_error_24dp),
contentDescription = null,
modifier = Modifier.size(24.dp)
)

2
app/src/main/res/layout/activity_videoplayer.xml
View File

@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
app:title="@string/unknown"
app:navigationIcon="@drawable/icn_arrow_back_24dp"
app:navigationIcon="@drawable/ic_arrow_back_24dp"
app:menu="@menu/menu_videoplayer"
app:navigationIconTint="?attr/colorOnSurface"
style="@style/Widget.Stoat.Toolbar" />

4
app/src/main/res/menu/menu_videoplayer.xml
View File

@ -4,7 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/mi_share"
android:icon="@drawable/icn_ios_share_24dp"
android:icon="@drawable/ic_ios_share_24dp"
android:iconTint="?attr/colorControlNormal"
android:iconTintMode="multiply"
android:title="@string/share"
@ -21,7 +21,7 @@
</item>
<item
android:id="@+id/mi_save"
android:icon="@drawable/icn_download_24dp"
android:icon="@drawable/ic_download_24dp"
android:iconTint="?attr/colorControlNormal"
android:title="@string/media_viewer_save"
app:showAsAction="ifRoom"