owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(merging-upstream): bunch of conflicts to solve

Browse Source
This commit is contained in:
LucasGGamerM
2024-02-14 20:50:54 -03:00
parent 8dffbff97c
commit 0af8dbf09b
2000 changed files with 52238 additions and 10716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mastodon/src/main/res/menu/attach.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/media"
android:title="@string/add_media"
android:visible="false"
android:icon="@drawable/ic_fluent_image_24_regular" />
<item
android:id="@+id/file"
android:title="@string/sk_attach_file"
android:icon="@drawable/ic_fluent_document_24_regular" />
<item
android:id="@+id/camera"
android:title="@string/mo_open_camera"
android:icon="@drawable/ic_fluent_camera_24_regular" />
</menu>

15
mastodon/src/main/res/menu/color_palettes.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group android:id="@+id/color_palettes_group" android:checkableBehavior="single">
<item android:id="@+id/m3_color" android:title="@string/sk_color_palette_material3"/>
<item android:id="@+id/purple_color" android:title="@string/sk_color_palette_purple"/>
<item android:id="@+id/pink_color" android:title="@string/sk_color_palette_pink"/>
<item android:id="@+id/green_color" android:title="@string/sk_color_palette_green"/>
<item android:id="@+id/blue_color" android:title="@string/sk_color_palette_blue"/>
<item android:id="@+id/brown_color" android:title="@string/sk_color_palette_brown"/>
<item android:id="@+id/yellow_color" android:title="@string/sk_color_palette_yellow"/>
<item android:id="@+id/red_color" android:title="@string/sk_color_palette_red"/>
<item android:id="@+id/black_and_white_color" android:title="@string/mo_color_palette_black_and_white"/>
<item android:id="@+id/nord_color" android:title="@string/mo_color_palette_nord"/>
</group>
</menu>

2
mastodon/src/main/res/menu/compose.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/publish" android:icon="@drawable/ic_send_24px" android:showAsAction="always" android:title="@string/publish"/>
<item android:id="@+id/publish" android:icon="@drawable/ic_fluent_send_24_regular" android:showAsAction="always" android:title="@string/publish"/>
</menu>

2
mastodon/src/main/res/menu/compose_edit.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/publish" android:icon="@drawable/ic_save_24px" android:showAsAction="always" android:title="@string/save"/>
<item android:id="@+id/publish" android:icon="@drawable/ic_fluent_save_24_regular" android:showAsAction="always" android:title="@string/save"/>
</menu>

2
mastodon/src/main/res/menu/compose_image_description.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/help" android:showAsAction="always" android:icon="@drawable/ic_help_24px" android:title="@string/help"/>
<item android:id="@+id/help" android:showAsAction="always" android:icon="@drawable/ic_fluent_question_circle_24_regular" android:title="@string/help"/>
</menu>

9
mastodon/src/main/res/menu/compose_more.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/schedule" android:title="@string/sk_schedule_post" android:icon="@drawable/ic_fluent_clock_24_regular" />
<item android:id="@+id/unschedule" android:title="@string/sk_schedule_post" android:icon="@drawable/ic_fluent_clock_24_filled" android:contentDescription="@string/sk_compose_no_schedule" />
<item android:id="@+id/draft" android:title="@string/sk_mark_as_draft" android:icon="@drawable/ic_fluent_drafts_24_regular" />
<item android:id="@+id/undraft" android:title="@string/sk_mark_as_draft" android:icon="@drawable/ic_fluent_drafts_24_filled" android:contentDescription="@string/sk_compose_no_draft" />
<item android:id="@+id/drafts" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_folder_open_24_regular" />
<item android:id="@+id/preview" android:title="@string/sk_open_post_preview" android:icon="@drawable/ic_fluent_receipt_sparkles_24_regular" android:visible="false" />
</menu>

31
mastodon/src/main/res/menu/compose_visibility.xml
View File

@@ -1,9 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/vis_public"
android:title="@string/visibility_public"/>
<item android:id="@+id/vis_followers"
android:title="@string/visibility_followers_only"/>
<item android:id="@+id/vis_private"
android:title="@string/visibility_private"/>
<group android:id="@+id/local_only_group" android:checkableBehavior="all">
<item
android:id="@+id/local_only"
android:visible="false"
android:icon="@drawable/ic_fluent_eye_24_regular"
android:title="@string/sk_local_only" />
</group>
<group android:id="@+id/visibility_group" android:checkableBehavior="single">
<item android:id="@+id/vis_local"
android:visible="false"
android:icon="@drawable/ic_fluent_eye_24_regular"
android:title="@string/sk_local_only"/>
<item android:id="@+id/vis_public"
android:icon="@drawable/ic_fluent_earth_24_regular"
android:title="@string/visibility_public"/>
<item android:id="@+id/vis_unlisted"
android:icon="@drawable/ic_fluent_lock_open_24_regular"
android:title="@string/sk_visibility_unlisted"/>
<item android:id="@+id/vis_followers"
android:icon="@drawable/ic_fluent_lock_closed_24_regular"
android:title="@string/visibility_followers_only"/>
<item android:id="@+id/vis_private"
android:icon="@drawable/ic_fluent_mention_24_regular"
android:title="@string/visibility_private"/>
</group>
</menu>

8
mastodon/src/main/res/menu/custom_local_timelines.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/pin"
android:title="@string/sk_pin_timeline"
android:icon="@drawable/ic_fluent_pin_24_regular"
android:showAsAction="always" />
</menu>

18
mastodon/src/main/res/menu/hashtag_timeline.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/pin"
android:title="@string/sk_pin_timeline"
android:icon="@drawable/ic_fluent_pin_24_regular"
android:showAsAction="always" />
<item
android:id="@+id/mute_hashtag"
android:icon="@drawable/ic_fluent_speaker_mute_24_regular"
android:showAsAction="always"
android:title="@string/mo_mute_hashtag"/>
<item
android:id="@+id/follow_hashtag"
android:icon="@drawable/ic_fluent_person_add_24_regular"
android:showAsAction="always"
android:title="@string/button_follow"/>
</menu>

28
mastodon/src/main/res/menu/home.xml
View File

@@ -1,13 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
tools:ignore="AlwaysShowAction">
<item
android:id="@+id/edit_list"
android:icon="@drawable/ic_edit_24px"
android:showAsAction="always"
android:title="@string/edit_list"/>
android:id="@+id/announcements_action"
android:icon="@drawable/ic_announcements_24_badged"
android:title="@string/sk_announcements"
android:visible="false"
android:showAsAction="always" />
<item
android:id="@+id/settings"
android:icon="@drawable/ic_settings_24px"
android:showAsAction="always"
android:title="@string/settings" />
android:id="@+id/settings_action"
android:icon="@drawable/ic_settings_24_badged"
android:title="@string/settings"
android:visible="false"
android:showAsAction="always" />
<item
android:id="@+id/overflow"
android:title="@string/more_options"
android:icon="@drawable/ic_fluent_more_vertical_24_regular"
android:showAsAction="always" />
</menu>

33
mastodon/src/main/res/menu/home_overflow.xml Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group android:id="@+id/top">
<item
android:id="@+id/settings"
android:icon="@drawable/ic_fluent_settings_24_regular"
android:title="@string/settings" />
<item
android:id="@+id/announcements"
android:icon="@drawable/ic_fluent_megaphone_24_regular"
android:title="@string/sk_announcements" />
<item
android:id="@+id/edit_timelines"
android:icon="@drawable/ic_fluent_edit_24_regular"
android:title="@string/sk_edit_timelines" />
</group>
<group android:id="@+id/bottom">
<item
android:id="@+id/lists"
android:icon="@drawable/ic_fluent_people_24_regular"
android:title="@string/sk_your_lists"
android:visible="false">
<menu />
</item>
<item
android:id="@+id/hashtags"
android:icon="@drawable/ic_fluent_number_symbol_24_regular"
android:title="@string/sk_hashtags_you_follow"
android:visible="false">
<menu />
</item>
</group>
</menu>

6
mastodon/src/main/res/menu/instance_info.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular"/>
<item android:id="@+id/open_timeline" android:title="@string/mo_instance_info_open_timeline" android:icon="@drawable/ic_fluent_timeline_24_regular"/>
<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser" android:icon="@drawable/ic_fluent_globe_24_regular"/>
</menu>

16
mastodon/src/main/res/menu/list.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/pin"
android:title="@string/sk_pin_timeline"
android:icon="@drawable/ic_fluent_pin_24_regular"
android:showAsAction="always" />
<item
android:id="@+id/edit"
android:title="@string/edit"
android:icon="@drawable/ic_fluent_edit_24_regular" />
<item
android:id="@+id/delete"
android:title="@string/delete"
android:icon="@drawable/ic_fluent_delete_24_regular" />
</menu>

6
mastodon/src/main/res/menu/list_reply_policies.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/reply_policy_list" android:title="@string/sk_list_replies_policy_list" />
<item android:id="@+id/reply_policy_followed" android:title="@string/sk_list_replies_policy_followed" />
<item android:id="@+id/reply_policy_none" android:title="@string/sk_list_replies_policy_none" />
</menu>

8
mastodon/src/main/res/menu/menu_list.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/create"
android:title="@string/sk_create"
android:icon="@drawable/ic_fluent_people_add_24_regular"
android:showAsAction="always" />
</menu>

11
mastodon/src/main/res/menu/mute_duration.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/duration_indefinite" android:title="@string/sk_duration_indefinite" />
<item android:id="@+id/duration_minutes_5" android:title="@string/sk_duration_minutes_5"/>
<item android:id="@+id/duration_minutes_30" android:title="@string/sk_duration_minutes_30"/>
<item android:id="@+id/duration_hours_1" android:title="@string/sk_duration_hours_1"/>
<item android:id="@+id/duration_hours_6" android:title="@string/sk_duration_hours_6"/>
<item android:id="@+id/duration_days_1" android:title="@string/sk_duration_days_1"/>
<item android:id="@+id/duration_days_3" android:title="@string/sk_duration_days_3"/>
<item android:id="@+id/duration_days_7" android:title="@string/sk_duration_days_7"/>
</menu>

24
mastodon/src/main/res/menu/notifications.xml
View File

@@ -1,4 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/mark_all_read" android:icon="@drawable/ic_done_all_24px" android:title="@string/mark_all_notifications_read" android:showAsAction="always"/>
<item
android:id="@+id/filter_notifications"
android:icon="@drawable/ic_fluent_filter_24_regular"
android:showAsAction="always"
android:visible="false"
android:title="@string/mo_filter_notifications" />
<item
android:id="@+id/follow_requests"
android:icon="@drawable/ic_follow_requests_24_badged"
android:showAsAction="always"
android:visible="false"
android:title="@string/sk_follow_requests" />
<item
android:id="@+id/mark_all_read"
android:icon="@drawable/ic_done_all_24px"
android:title="@string/mark_all_notifications_read"
android:showAsAction="always" />
<item
android:id="@+id/clear_notifications"
android:icon="@drawable/ic_fluent_mail_inbox_dismiss_24_regular"
android:showAsAction="collapseActionView"
android:visible="false"
android:title="@string/sk_clear_all_notifications" />
</menu>

32
mastodon/src/main/res/menu/post.xml
View File

@@ -1,19 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group android:id="@+id/menu_group1">
<item android:id="@+id/translate" android:title="@string/translate_post"/>
<item android:id="@+id/bookmark" android:title="@string/add_bookmark"/>
<item android:id="@+id/share" android:title="@string/button_share"/>
<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser"/>
<item android:id="@+id/edit" android:title="@string/edit" android:icon="@drawable/ic_fluent_edit_24_regular"/>
<item android:id="@+id/delete" android:title="@string/delete" android:icon="@drawable/ic_fluent_delete_24_regular"/>
<item android:id="@+id/delete_and_redraft" android:title="@string/sk_delete_and_redraft" android:icon="@drawable/ic_fluent_arrow_clockwise_24_regular" />
<item android:id="@+id/pin" android:title="@string/sk_pin_post" android:icon="@drawable/ic_fluent_pin_24_regular"/>
<item android:id="@+id/unpin" android:title="@string/sk_unpin_post" android:icon="@drawable/ic_fluent_pin_off_24_regular"/>
<item android:id="@+id/copy_link" android:title="@string/fallback_menu_item_copy_link"/>
<item android:id="@+id/edit" android:title="@string/edit"/>
<item android:id="@+id/delete" android:title="@string/delete"/>
</group>
<group android:id="@+id/menu_group2">
<item android:id="@+id/add_to_list" android:title="@string/add_user_to_list"/>
<item android:id="@+id/follow" android:title="@string/follow_user"/>
<item android:id="@+id/mute" android:title="@string/mute_user"/>
<item android:id="@+id/block" android:title="@string/block_user"/>
<item android:id="@+id/report" android:title="@string/report_user"/>
<item android:id="@+id/follow" android:title="@string/follow_user" android:icon="@drawable/ic_fluent_person_add_24_regular"/>
<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
<item android:id="@+id/block" android:title="@string/block_user" android:icon="@drawable/ic_fluent_person_prohibited_24_regular"/>
<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>
<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
</group>
<group android:id="@+id/menu_group3">
<item android:id="@+id/mute_conversation" android:title="@string/mo_mute_conversation" android:icon="@drawable/ic_fluent_alert_off_24_regular" />
<item android:id="@+id/unmute_conversation" android:title="@string/mo_unmute_conversation" android:icon="@drawable/ic_fluent_alert_24_regular" />
</group>
<group android:id="@+id/menu_group4">
<!-- <item android:id="@+id/share" android:title="@string/button_share" android:icon="@drawable/ic_fluent_share_24_regular"/>-->
<item android:id="@+id/copy_link" android:title="@string/sk_copy_link_to_post" android:icon="@drawable/ic_fluent_link_24_regular"/>
<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser" android:icon="@drawable/ic_fluent_globe_24_regular"/>
<item android:id="@+id/open_with_account" android:title="@string/sk_open_with_account" android:icon="@drawable/ic_fluent_person_swap_24_regular">
<menu android:id="@+id/accounts" />
</item>
</group>
</menu>

25
mastodon/src/main/res/menu/profile.xml
View File

@@ -1,13 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group android:orderInCategory="1">
<item android:id="@+id/share" android:title="@string/share_user"/>
<group android:id="@+id/menu_group1">
<item android:id="@+id/edit_note" android:title="@string/sk_add_note" android:icon="@drawable/ic_fluent_notepad_24_regular" android:showAsAction="ifRoom" />
</group>
<group android:id="@+id/menu_group2">
<item android:id="@+id/add_to_list" android:title="@string/add_user_to_list"/>
<item android:id="@+id/mute" android:title="@string/mute_user"/>
<item android:id="@+id/block" android:title="@string/block_user"/>
<item android:id="@+id/report" android:title="@string/report_user"/>
<item android:id="@+id/block_domain" android:title="@string/block_domain"/>
<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user"/>
<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser"/>
<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user" android:icon="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
<item android:id="@+id/block" android:title="@string/block_user" android:icon="@drawable/ic_fluent_person_prohibited_24_regular"/>
<item android:id="@+id/soft_block" android:title="@string/sk_remove_follower" android:icon="@drawable/ic_fluent_person_delete_24_regular"/>
<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>
</group>
<group android:id="@+id/menu_group3">
<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser" android:icon="@drawable/ic_fluent_globe_24_regular"/>
<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular"/>
<item android:id="@+id/open_with_account" android:title="@string/sk_open_with_account" android:visible="false" android:icon="@drawable/ic_fluent_person_swap_24_regular">
<menu android:id="@+id/accounts" />
</item>
</group>
</menu>

20
mastodon/src/main/res/menu/profile_own.xml
View File

@@ -1,7 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/bookmarks" android:title="@string/bookmarks" android:icon="@drawable/ic_bookmark_24px" android:showAsAction="always"/>
<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_star_24px" android:showAsAction="always"/>
<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_share_24px" android:showAsAction="always"/>
<!-- TODO add to list -->
<group android:id="@+id/menu_group1">
<item android:id="@+id/followed_hashtags" android:title="@string/sk_hashtags_you_follow" android:icon="@drawable/ic_fluent_number_symbol_24_regular"/>
<item android:id="@+id/bookmarks" android:title="@string/bookmarks" android:icon="@drawable/ic_fluent_bookmark_multiple_24_regular" android:showAsAction="always"/>
<item android:id="@+id/manage_user_lists" android:title="@string/sk_your_lists" android:icon="@drawable/ic_fluent_people_24_regular"/>
<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular"/>
<item android:id="@+id/muted_accounts" android:title="@string/sk_muted_accounts" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
<item android:id="@+id/blocked_accounts" android:title="@string/sk_blocked_accounts" android:icon="@drawable/ic_fluent_shield_24_regular"/>
<item android:id="@+id/scheduled" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_folder_open_24_regular" android:showAsAction="always"/>
</group>
<group android:id="@+id/menu_group2">
<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser" android:icon="@drawable/ic_fluent_globe_24_regular"/>
<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular"/>
<item android:id="@+id/open_with_account" android:title="@string/sk_open_with_account" android:visible="false" android:icon="@drawable/ic_fluent_person_swap_24_regular">
<menu android:id="@+id/accounts" />
</item>
</group>
</menu>

6
mastodon/src/main/res/menu/reply_visibility.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/reply_visibility_all" android:title="@string/sk_settings_reply_visibility_all"/>
<item android:id="@+id/reply_visibility_following" android:title="@string/sk_settings_reply_visibility_following"/>
<item android:id="@+id/reply_visibility_self" android:title="@string/sk_settings_reply_visibility_self"/>
</menu>

12
mastodon/src/main/res/menu/settings_auto_reveal_spoiler.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/auto_reveal_never"
android:title="@string/sk_settings_auto_reveal_nobody" />
<item
android:id="@+id/auto_reveal_threads"
android:title="@string/sk_settings_auto_reveal_author" />
<item
android:id="@+id/auto_reveal_discussions"
android:title="@string/sk_settings_auto_reveal_anyone" />
</menu>

2
mastodon/src/main/res/menu/settings_edit_filter.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/save" android:showAsAction="always" android:icon="@drawable/ic_save_24px" android:title="@string/save"/>
<item android:id="@+id/save" android:showAsAction="always" android:icon="@drawable/ic_fluent_save_24_regular" android:title="@string/save"/>
</menu>

2
mastodon/src/main/res/menu/settings_filter_words_action_mode.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/delete" android:showAsAction="always" android:icon="@drawable/ic_delete_24px" android:title="@string/delete"/>
<item android:id="@+id/delete" android:showAsAction="always" android:icon="@drawable/ic_fluent_delete_24_regular" android:title="@string/delete"/>
</menu>

6
mastodon/src/main/res/menu/settings_prefix_reply_mode.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/prefix_replies_never" android:title="@string/sk_settings_prefix_replies_never" />
<item android:id="@+id/prefix_replies_to_others" android:title="@string/sk_settings_prefix_replies_to_others" />
<item android:id="@+id/prefix_replies_always" android:title="@string/sk_settings_prefix_replies_always" />
</menu>

4
mastodon/src/main/res/menu/standalone_list_timeline.xml
View File

@@ -2,12 +2,12 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/members"
android:icon="@drawable/ic_group_24px"
android:icon="@drawable/ic_fluent_people_24_regular"
android:title="@string/list_members"
android:showAsAction="always"/>
<item
android:id="@+id/edit_list"
android:icon="@drawable/ic_edit_24px"
android:icon="@drawable/ic_fluent_edit_24_regular"
android:showAsAction="always"
android:title="@string/edit_list"/>
</menu>