Skip to content

Commit 4015513

Browse files
infiinfi
committed
fix: knew i forgot something
1 parent 839247a commit 4015513

File tree

73 files changed

+222
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+222
-222
lines changed

‎app/src/main/java/chat/stoat/activities/InviteActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ fun InvalidInviteError(error: StoatAPIError? = null, onDismissRequest: () -> Uni
280280
onDismissRequest = onDismissRequest,
281281
icon = {
282282
Icon(
283-
painter = painterResource(R.drawable.icn_error_24dp),
283+
painter = painterResource(R.drawable.ic_error_24dp),
284284
contentDescription = null, // decorative
285285
tint = MaterialTheme.colorScheme.primary
286286
)
@@ -326,7 +326,7 @@ fun NoInviteSpecifiedError(onDismissRequest: () -> Unit) {
326326
onDismissRequest = onDismissRequest,
327327
icon = {
328328
Icon(
329-
painter = painterResource(R.drawable.icn_error_24dp),
329+
painter = painterResource(R.drawable.ic_error_24dp),
330330
contentDescription = null, // decorative
331331
tint = MaterialTheme.colorScheme.primary
332332
)

‎app/src/main/java/chat/stoat/activities/media/ImageViewActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ fun ImageViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) {
205205
onClose()
206206
}) {
207207
Icon(
208-
painter = painterResource(id = R.drawable.icn_arrow_back_24dp),
208+
painter = painterResource(id = R.drawable.ic_arrow_back_24dp),
209209
contentDescription = stringResource(id = R.string.back)
210210
)
211211
}
@@ -215,7 +215,7 @@ fun ImageViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) {
215215
shareSubmenuIsOpen.value = true
216216
}) {
217217
Icon(
218-
painter = painterResource(id = R.drawable.icn_ios_share_24dp),
218+
painter = painterResource(id = R.drawable.ic_ios_share_24dp),
219219
contentDescription = stringResource(id = R.string.share)
220220
)
221221
}
@@ -254,7 +254,7 @@ fun ImageViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) {
254254
saveToGallery()
255255
}) {
256256
Icon(
257-
painter = painterResource(id = R.drawable.icn_download_24dp),
257+
painter = painterResource(id = R.drawable.ic_download_24dp),
258258
contentDescription = stringResource(
259259
id = R.string.media_viewer_save
260260
)

‎app/src/main/java/chat/stoat/activities/voice/IncomingActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ fun IncomingCallInner() {
278278
.background(MaterialTheme.colorScheme.tertiaryContainer)
279279
) {
280280
Icon(
281-
painter = painterResource(R.drawable.icn_call_24dp__fill),
281+
painter = painterResource(R.drawable.ic_call_24dp__fill),
282282
contentDescription = null,
283283
tint = MaterialTheme.colorScheme.onTertiaryContainer,
284284
modifier = Modifier

‎app/src/main/java/chat/stoat/c2dm/HandlerService.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class HandlerService : FirebaseMessagingService() {
158158

159159
val action: NotificationCompat.Action =
160160
NotificationCompat.Action.Builder(
161-
R.drawable.icn_reply_24dp,
161+
R.drawable.ic_reply_24dp,
162162
getString(R.string.message_context_sheet_actions_reply),
163163
PendingIntent.getActivity(
164164
this,
@@ -178,7 +178,7 @@ class HandlerService : FirebaseMessagingService() {
178178
)
179179

180180
val builder = NotificationCompat.Builder(this, CHANNEL_ID_GROUP_CONVERSATIONS_MESSAGES)
181-
.setSmallIcon(R.drawable.icn_chat_24dp)
181+
.setSmallIcon(R.drawable.ic_chat_24dp)
182182
.setContentTitle(user.displayName ?: user.username)
183183
.setContentText(message.content)
184184
.setContentIntent(contentIntent)

‎app/src/main/java/chat/stoat/composables/chat/InlineBadge.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,35 +27,35 @@ fun InlineBadge(
2727
) {
2828
when (badge) {
2929
InlineBadge.Bot -> Icon(
30-
painter = painterResource(id = R.drawable.icn_smart_toy_24dp),
30+
painter = painterResource(id = R.drawable.ic_smart_toy_24dp),
3131
contentDescription = stringResource(id = R.string.badge_bot_alt),
3232
tint = colour,
3333
modifier = modifier
3434
)
3535

3636
InlineBadge.Bridge -> Icon(
37-
painter = painterResource(id = R.drawable.icn_link_24dp),
37+
painter = painterResource(id = R.drawable.ic_link_24dp),
3838
contentDescription = stringResource(id = R.string.badge_masquerade_alt),
3939
tint = colour,
4040
modifier = modifier
4141
)
4242

4343
InlineBadge.PlatformModeration -> Icon(
44-
painter = painterResource(id = R.drawable.icn_brightness_alert_24dp),
44+
painter = painterResource(id = R.drawable.ic_brightness_alert_24dp),
4545
contentDescription = stringResource(id = R.string.badge_bot_alt),
4646
tint = colour,
4747
modifier = modifier
4848
)
4949

5050
InlineBadge.TeamMember -> Icon(
51-
painter = painterResource(id = R.drawable.icn_hardware_24dp),
51+
painter = painterResource(id = R.drawable.ic_hardware_24dp),
5252
contentDescription = stringResource(id = R.string.badge_team_member_alt),
5353
tint = colour,
5454
modifier = modifier
5555
)
5656

5757
InlineBadge.Webhook -> Icon(
58-
painter = painterResource(id = R.drawable.icn_cloud_24dp),
58+
painter = painterResource(id = R.drawable.ic_cloud_24dp),
5959
contentDescription = stringResource(id = R.string.badge_webhook_alt),
6060
tint = colour,
6161
modifier = modifier.padding(start = 4.dp)

‎app/src/main/java/chat/stoat/composables/chat/Message.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ fun Message(
279279
modifier = Modifier.padding(vertical = 8.dp)
280280
) {
281281
Icon(
282-
painter = painterResource(R.drawable.icn_block_24dp),
282+
painter = painterResource(R.drawable.ic_block_24dp),
283283
contentDescription = null
284284
)
285285

@@ -427,7 +427,7 @@ fun Message(
427427

428428
if (message.edited != null) {
429429
Icon(
430-
painter = painterResource(R.drawable.icn_edit_24dp),
430+
painter = painterResource(R.drawable.ic_edit_24dp),
431431
contentDescription = stringResource(id = R.string.edited),
432432
tint = MaterialTheme.colorScheme.onBackground.copy(
433433
alpha = 0.5f
@@ -631,7 +631,7 @@ fun Message(
631631
.padding(8.dp)
632632
) {
633633
Icon(
634-
painter = painterResource(R.drawable.icn_add_reaction_24dp),
634+
painter = painterResource(R.drawable.ic_add_reaction_24dp),
635635
contentDescription = stringResource(R.string.message_context_sheet_actions_react),
636636
modifier = Modifier.size(16.dp)
637637
)

‎app/src/main/java/chat/stoat/composables/chat/MessageAttachment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ fun FileAttachment(attachment: AutumnResource) {
5656
verticalAlignment = Alignment.CenterVertically
5757
) {
5858
Icon(
59-
painter = painterResource(id = R.drawable.icn_file_present_24dp),
59+
painter = painterResource(id = R.drawable.ic_file_present_24dp),
6060
contentDescription = null
6161
)
6262

@@ -138,7 +138,7 @@ fun VideoPlayButton() {
138138
)
139139

140140
Icon(
141-
painter = painterResource(R.drawable.icn_play_arrow_24dp),
141+
painter = painterResource(R.drawable.ic_play_arrow_24dp),
142142
contentDescription = stringResource(id = R.string.media_viewer_play),
143143
modifier = Modifier
144144
.width(32.dp)

‎app/src/main/java/chat/stoat/composables/chat/MessageField.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ fun MessageField(
475475
label = { Text("@${item.content}") },
476476
icon = {
477477
Icon(
478-
painter = painterResource(R.drawable.icn_campaign_24dp),
478+
painter = painterResource(R.drawable.ic_campaign_24dp),
479479
contentDescription = null,
480480
modifier = Modifier
481481
.size(SuggestionChipDefaults.IconSize)
@@ -582,7 +582,7 @@ fun MessageField(
582582
)
583583

584584
Icon(
585-
painter = painterResource(R.drawable.icn_mood_24dp),
585+
painter = painterResource(R.drawable.ic_mood_24dp),
586586
tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
587587
contentDescription = stringResource(id = R.string.pick_emoji_alt),
588588
modifier = Modifier
@@ -621,8 +621,8 @@ fun MessageField(
621621
) {
622622
Icon(
623623
painter = when {
624-
editMode -> painterResource(R.drawable.icn_edit_24dp)
625-
else -> painterResource(R.drawable.icn_send_24dp)
624+
editMode -> painterResource(R.drawable.ic_edit_24dp)
625+
else -> painterResource(R.drawable.ic_send_24dp)
626626
},
627627
tint = MaterialTheme.colorScheme.primary,
628628
contentDescription = stringResource(id = R.string.send_alt),

‎app/src/main/java/chat/stoat/composables/chat/SystemMessage.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
185185
when (type) {
186186
SystemMessageType.CHANNEL_OWNERSHIP_CHANGED -> {
187187
Icon(
188-
painter = painterResource(R.drawable.icn_key_24dp),
188+
painter = painterResource(R.drawable.ic_key_24dp),
189189
contentDescription = stringResource(R.string.system_message_ownership_changed_alt),
190190
tint = LocalContentColor.current,
191191
modifier = modifier.size(size)
@@ -194,7 +194,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
194194

195195
SystemMessageType.CHANNEL_ICON_CHANGED -> {
196196
Icon(
197-
painter = painterResource(R.drawable.icn_landscape_2_edit_24dp),
197+
painter = painterResource(R.drawable.ic_landscape_2_edit_24dp),
198198
contentDescription = stringResource(
199199
R.string.system_message_channel_icon_changed_alt
200200
),
@@ -205,7 +205,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
205205

206206
SystemMessageType.CHANNEL_DESCRIPTION_CHANGED -> {
207207
Icon(
208-
painter = painterResource(R.drawable.icn_contract_edit_24dp),
208+
painter = painterResource(R.drawable.ic_contract_edit_24dp),
209209
contentDescription = stringResource(
210210
R.string.system_message_channel_description_changed_alt
211211
),
@@ -216,7 +216,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
216216

217217
SystemMessageType.CHANNEL_RENAMED -> {
218218
Icon(
219-
painter = painterResource(R.drawable.icn_ink_highlighter_move_24dp),
219+
painter = painterResource(R.drawable.ic_ink_highlighter_move_24dp),
220220
contentDescription = stringResource(R.string.system_message_channel_renamed_alt),
221221
tint = LocalContentColor.current,
222222
modifier = modifier.size(size)
@@ -225,7 +225,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
225225

226226
SystemMessageType.USER_REMOVE -> {
227227
Icon(
228-
painter = painterResource(R.drawable.icn_group_remove_24dp),
228+
painter = painterResource(R.drawable.ic_group_remove_24dp),
229229
contentDescription = stringResource(R.string.system_message_user_removed_alt),
230230
tint = LocalContentColor.current,
231231
modifier = modifier.size(size)
@@ -234,7 +234,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
234234

235235
SystemMessageType.USER_ADDED -> {
236236
Icon(
237-
painter = painterResource(R.drawable.icn_group_add_24dp),
237+
painter = painterResource(R.drawable.ic_group_add_24dp),
238238
contentDescription = stringResource(R.string.system_message_user_added_alt),
239239
tint = LocalContentColor.current,
240240
modifier = modifier.size(size)
@@ -243,7 +243,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
243243

244244
SystemMessageType.USER_BANNED -> {
245245
Icon(
246-
painter = painterResource(R.drawable.icn_gavel_24dp),
246+
painter = painterResource(R.drawable.ic_gavel_24dp),
247247
contentDescription = stringResource(R.string.system_message_user_banned_alt),
248248
tint = LocalContentColor.current,
249249
modifier = modifier.size(size)
@@ -252,7 +252,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
252252

253253
SystemMessageType.USER_KICKED -> {
254254
Icon(
255-
painter = painterResource(R.drawable.icn_sports_and_outdoors_24dp),
255+
painter = painterResource(R.drawable.ic_sports_and_outdoors_24dp),
256256
contentDescription = stringResource(R.string.system_message_user_kicked_alt),
257257
tint = LocalContentColor.current,
258258
modifier = modifier.size(size)
@@ -261,7 +261,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
261261

262262
SystemMessageType.USER_LEFT -> {
263263
Icon(
264-
painter = painterResource(R.drawable.icn_door_open_24dp),
264+
painter = painterResource(R.drawable.ic_door_open_24dp),
265265
contentDescription = stringResource(R.string.system_message_user_left_alt),
266266
tint = LocalContentColor.current,
267267
modifier = modifier.size(size)
@@ -270,7 +270,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
270270

271271
SystemMessageType.USER_JOINED -> {
272272
Icon(
273-
painter = painterResource(R.drawable.icn_waving_hand_24dp),
273+
painter = painterResource(R.drawable.ic_waving_hand_24dp),
274274
contentDescription = stringResource(R.string.system_message_user_joined_alt),
275275
tint = LocalContentColor.current,
276276
modifier = modifier.size(size),
@@ -279,7 +279,7 @@ fun SystemMessageIcon(type: SystemMessageType, modifier: Modifier = Modifier, si
279279

280280
SystemMessageType.TEXT -> {
281281
Icon(
282-
painter = painterResource(R.drawable.icn_info_24dp),
282+
painter = painterResource(R.drawable.ic_info_24dp),
283283
contentDescription = stringResource(R.string.system_message_text_alt),
284284
tint = LocalContentColor.current,
285285
modifier = modifier.size(size)

‎app/src/main/java/chat/stoat/composables/chat/UnsupportedMessage.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fun UnsupportedMessage(modifier: Modifier = Modifier, context: String? = null) {
5555
LocalContentColor provides MaterialTheme.colorScheme.onErrorContainer,
5656
) {
5757
Icon(
58-
painter = painterResource(R.drawable.icn_error_24dp),
58+
painter = painterResource(R.drawable.ic_error_24dp),
5959
contentDescription = null,
6060
tint = LocalContentColor.current,
6161
modifier = Modifier.size(24.dp)

0 commit comments

Comments
 (0)