Reporting M3 redesign
This commit is contained in:
@@ -44,6 +44,7 @@
|
||||
<attr name="colorM3OnErrorContainer" format="color"/>
|
||||
<attr name="colorM3PrimaryInverse" format="color"/>
|
||||
<attr name="colorSensitiveOverlay" format="color"/>
|
||||
<attr name="colorWhite" format="color"/>
|
||||
|
||||
<attr name="primaryLargeButtonStyle" format="reference"/>
|
||||
<attr name="secondaryLargeButtonStyle" format="reference"/>
|
||||
|
||||
115
mastodon/src/main/res/values/mtrl_switch.xml
Normal file
115
mastodon/src/main/res/values/mtrl_switch.xml
Normal file
@@ -0,0 +1,115 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- MaterialSwitch-specific state to represent presence of a thumb icon. -->
|
||||
<attr name="state_with_icon" format="boolean" />
|
||||
|
||||
<!-- Generated from token set (md.comp.switch) in context (platform=android, audience=3p). -->
|
||||
<!-- Enabled - Icon -->
|
||||
<macro name="m3_comp_switch_selected_icon_color">?attr/colorM3OnPrimaryContainer</macro>
|
||||
<macro name="m3_comp_switch_unselected_icon_color">?attr/colorM3SurfaceVariant</macro>
|
||||
<!-- Enabled - Track -->
|
||||
<dimen name="m3_comp_switch_track_height">32dp</dimen>
|
||||
<dimen name="m3_comp_switch_track_width">52dp</dimen>
|
||||
<macro name="m3_comp_switch_unselected_track_outline_color">?attr/colorM3Outline</macro>
|
||||
<macro name="m3_comp_switch_selected_track_color">?attr/colorM3Primary</macro>
|
||||
<macro name="m3_comp_switch_unselected_track_color">?attr/colorM3SurfaceVariant</macro>
|
||||
<!-- Enabled - Handle -->
|
||||
<macro name="m3_comp_switch_selected_handle_color">?attr/colorM3OnPrimary</macro>
|
||||
<macro name="m3_comp_switch_unselected_handle_color">?attr/colorM3Outline</macro>
|
||||
<!-- Disabled - Icon -->
|
||||
<macro name="m3_comp_switch_disabled_selected_icon_color">?attr/colorM3OnSurface</macro>
|
||||
<item name="m3_comp_switch_disabled_selected_icon_opacity" format="float" type="dimen">0.38</item>
|
||||
<macro name="m3_comp_switch_disabled_unselected_icon_color">?attr/colorM3SurfaceVariant</macro>
|
||||
<item name="m3_comp_switch_disabled_unselected_icon_opacity" format="float" type="dimen">0.38</item>
|
||||
<!-- Disabled - Track -->
|
||||
<item name="m3_comp_switch_disabled_track_opacity" format="float" type="dimen">0.12</item>
|
||||
<macro name="m3_comp_switch_disabled_selected_track_color">?attr/colorM3OnSurface</macro>
|
||||
<macro name="m3_comp_switch_disabled_unselected_track_color">?attr/colorM3SurfaceVariant</macro>
|
||||
<macro name="m3_comp_switch_disabled_unselected_track_outline_color">?attr/colorM3OnSurface</macro>
|
||||
<!-- Disabled - Handle -->
|
||||
<item name="m3_comp_switch_disabled_unselected_handle_opacity" format="float" type="dimen">0.38</item>
|
||||
<item name="m3_comp_switch_disabled_selected_handle_opacity" format="float" type="dimen">1</item>
|
||||
<macro name="m3_comp_switch_disabled_selected_handle_color">?attr/colorM3Surface</macro>
|
||||
<macro name="m3_comp_switch_disabled_unselected_handle_color">?attr/colorM3OnSurface</macro>
|
||||
<!-- Hovered - Icon -->
|
||||
<macro name="m3_comp_switch_selected_hover_icon_color">?attr/colorM3OnPrimaryContainer</macro>
|
||||
<macro name="m3_comp_switch_unselected_hover_icon_color">?attr/colorM3SurfaceVariant</macro>
|
||||
<!-- Hovered - Track -->
|
||||
<macro name="m3_comp_switch_selected_hover_track_color">?attr/colorM3Primary</macro>
|
||||
<macro name="m3_comp_switch_selected_hover_state_layer_color">?attr/colorM3Primary</macro>
|
||||
<macro name="m3_comp_switch_unselected_hover_track_color">?attr/colorM3SurfaceVariant</macro>
|
||||
<macro name="m3_comp_switch_unselected_hover_track_outline_color">?attr/colorM3Outline</macro>
|
||||
<macro name="m3_comp_switch_unselected_hover_state_layer_color">?attr/colorM3OnSurface</macro>
|
||||
<!-- Hovered - Handle -->
|
||||
<macro name="m3_comp_switch_selected_hover_handle_color">?attr/colorM3PrimaryContainer</macro>
|
||||
<macro name="m3_comp_switch_unselected_hover_handle_color">?attr/colorM3OnSurfaceVariant</macro>
|
||||
<!-- Focused - Icon -->
|
||||
<macro name="m3_comp_switch_selected_focus_icon_color">?attr/colorM3OnPrimaryContainer</macro>
|
||||
<macro name="m3_comp_switch_unselected_focus_icon_color">?attr/colorM3SurfaceVariant</macro>
|
||||
<!-- Focused - Track -->
|
||||
<macro name="m3_comp_switch_selected_focus_track_color">?attr/colorM3Primary</macro>
|
||||
<macro name="m3_comp_switch_selected_focus_state_layer_color">?attr/colorM3Primary</macro>
|
||||
<macro name="m3_comp_switch_unselected_focus_track_color">?attr/colorM3SurfaceVariant</macro>
|
||||
<macro name="m3_comp_switch_unselected_focus_track_outline_color">?attr/colorM3Outline</macro>
|
||||
<macro name="m3_comp_switch_unselected_focus_state_layer_color">?attr/colorM3OnSurface</macro>
|
||||
<!-- Focused - Handle -->
|
||||
<macro name="m3_comp_switch_selected_focus_handle_color">?attr/colorM3PrimaryContainer</macro>
|
||||
<macro name="m3_comp_switch_unselected_focus_handle_color">?attr/colorM3OnSurfaceVariant</macro>
|
||||
<!-- Pressed (rippple) - Icon -->
|
||||
<macro name="m3_comp_switch_selected_pressed_icon_color">?attr/colorM3OnPrimaryContainer</macro>
|
||||
<macro name="m3_comp_switch_unselected_pressed_icon_color">?attr/colorM3SurfaceVariant</macro>
|
||||
<!-- Pressed (rippple) - Track -->
|
||||
<macro name="m3_comp_switch_selected_pressed_track_color">?attr/colorM3Primary</macro>
|
||||
<macro name="m3_comp_switch_selected_pressed_state_layer_color">?attr/colorM3Primary</macro>
|
||||
<macro name="m3_comp_switch_unselected_pressed_track_color">?attr/colorM3SurfaceVariant</macro>
|
||||
<macro name="m3_comp_switch_unselected_pressed_track_outline_color">?attr/colorM3Outline</macro>
|
||||
<macro name="m3_comp_switch_unselected_pressed_state_layer_color">?attr/colorM3OnSurface</macro>
|
||||
<!-- Pressed (rippple) - Handle -->
|
||||
<macro name="m3_comp_switch_selected_pressed_handle_color">?attr/colorM3PrimaryContainer</macro>
|
||||
<macro name="m3_comp_switch_unselected_pressed_handle_color">?attr/colorM3OnSurfaceVariant</macro>
|
||||
|
||||
|
||||
<dimen name="mtrl_switch_thumb_size">32dp</dimen>
|
||||
<dimen name="mtrl_switch_track_width">@dimen/m3_comp_switch_track_width</dimen>
|
||||
<dimen name="mtrl_switch_track_height">@dimen/m3_comp_switch_track_height</dimen>
|
||||
<dimen name="mtrl_switch_text_padding">16dp</dimen>
|
||||
|
||||
<!-- Below path data are used to morph the thumb shape between different
|
||||
states. All of them start from the orientation of 270 degrees, draw 90
|
||||
degrees clockwise, draw a horizontal line (may have zero length if it's a
|
||||
circle), draw 180 degrees clockwise, draw another horizontal line (may
|
||||
have zero length if it's a circle), and then draw the final 90 degrees to
|
||||
finish a circle or a capsule. -->
|
||||
<!-- Path data to draw a larger thumb circle when the thumb is pressed. -->
|
||||
<string name="mtrl_switch_thumb_path_pressed" translatable="false">M2,16 A14,14 0 0,1 16,2 H16 A14,14 0 0,1 16,30 H16 A14,14 0 0,1 2,16</string>
|
||||
<!-- Path data to draw a thumb circle when the switch is checked. -->
|
||||
<string name="mtrl_switch_thumb_path_checked" translatable="false">M4,16 A12,12 0 0,1 16,4 H16 A12,12 0 0,1 16,28 H16 A12,12 0 0,1 4,16</string>
|
||||
<!-- Path data to draw a smaller thumb circle when the switch is unchecked. -->
|
||||
<string name="mtrl_switch_thumb_path_unchecked" translatable="false">M8,16 A8,8 0 0,1 16,8 H16 A8,8 0 0,1 16,24 H16 A8,8 0 0,1 8,16</string>
|
||||
<!-- Path data to draw a morphed thumb circle when the switch's checked state is changing. -->
|
||||
<string name="mtrl_switch_thumb_path_morphing" translatable="false">M0,16 A11,11 0 0,1 11,5 H21 A11,11 0 0,1 21,27 H11 A11,11 0 0,1 0,16</string>
|
||||
|
||||
<string name="mtrl_switch_thumb_group_name" translatable="false">circle_group</string>
|
||||
<string name="mtrl_switch_thumb_path_name" translatable="false">circle</string>
|
||||
|
||||
<!-- Path data to draw the switch track. -->
|
||||
<string name="mtrl_switch_track_path" translatable="false">M0,16 A16,16 0 0,1 16,0 H36 A16,16 0 0,1 36,32 H16 A16,16 0 0,1 0,16</string>
|
||||
<!-- Path data to draw the switch track decor. -->
|
||||
<string name="mtrl_switch_track_decoration_path" translatable="false">M1,16 A15,15 0 0,1 16,1 H36 A15,15 0 0,1 36,31 H16 A15,15 0 0,1 1,16</string>
|
||||
|
||||
<!-- Note: The following duration values are different from the design spec,
|
||||
since the thumb position animation duration is hard-coded in
|
||||
SwitchCompat and we have no way to override it. Therefore the
|
||||
following values are set according to the position animation
|
||||
duration (250ms). -->
|
||||
<integer name="mtrl_switch_thumb_motion_duration">@integer/m3_sys_motion_duration_medium1</integer>
|
||||
<integer name="mtrl_switch_thumb_pre_morphing_duration">@integer/m3_sys_motion_duration_short2</integer>
|
||||
<integer name="mtrl_switch_thumb_post_morphing_duration">@integer/m3_sys_motion_duration_short3</integer>
|
||||
<integer name="mtrl_switch_thumb_pressed_duration">@integer/m3_sys_motion_duration_short2</integer>
|
||||
|
||||
<integer name="mtrl_switch_thumb_viewport_size">32</integer>
|
||||
<integer name="mtrl_switch_thumb_viewport_center_coordinate">16</integer>
|
||||
|
||||
<integer name="mtrl_switch_track_viewport_width">52</integer>
|
||||
<integer name="mtrl_switch_track_viewport_height">32</integer>
|
||||
</resources>
|
||||
@@ -8,7 +8,7 @@
|
||||
<string name="next">Next</string>
|
||||
<string name="loading_instance">Retrieving server info…</string>
|
||||
<string name="error">Error</string>
|
||||
<string name="not_a_mastodon_instance">%s doesn\'t appear to be a Mastodon server.</string>
|
||||
<string name="not_a_mastodon_instance">%s doesn’t appear to be a Mastodon server.</string>
|
||||
<string name="ok">OK</string>
|
||||
<string name="preparing_auth">Preparing for authentication…</string>
|
||||
<string name="finishing_auth">Finishing authentication…</string>
|
||||
@@ -150,16 +150,16 @@
|
||||
<item quantity="other">Discussed %d times</item>
|
||||
</plurals>
|
||||
<string name="report_title">Report %s</string>
|
||||
<string name="report_choose_reason">What\'s wrong with this post?</string>
|
||||
<string name="report_choose_reason_account">What\'s wrong with %s?</string>
|
||||
<string name="report_choose_reason">What’s wrong with this post?</string>
|
||||
<string name="report_choose_reason_account">What’s wrong with %s?</string>
|
||||
<string name="report_choose_reason_subtitle">Select the best match</string>
|
||||
<string name="report_reason_personal">I don\'t like it</string>
|
||||
<string name="report_reason_personal">I don’t like it</string>
|
||||
<string name="report_reason_personal_subtitle">It is not something you want to see</string>
|
||||
<string name="report_reason_spam">It\'s spam</string>
|
||||
<string name="report_reason_spam">It’s spam</string>
|
||||
<string name="report_reason_spam_subtitle">Malicious links, fake engagement, or repetitive replies</string>
|
||||
<string name="report_reason_violation">It violates server rules</string>
|
||||
<string name="report_reason_violation_subtitle">You are aware that it breaks specific rules</string>
|
||||
<string name="report_reason_other">It\'s something else</string>
|
||||
<string name="report_reason_other">It’s something else</string>
|
||||
<string name="report_reason_other_subtitle">The issue does not fit into other categories</string>
|
||||
<string name="report_choose_rule">Which rules are being violated?</string>
|
||||
<string name="report_choose_rule_subtitle">Select all that apply</string>
|
||||
@@ -168,14 +168,14 @@
|
||||
<string name="report_comment_title">Is there anything else we should know?</string>
|
||||
<string name="report_comment_hint">Additional comments</string>
|
||||
<string name="sending_report">Sending report…</string>
|
||||
<string name="report_sent_title">Thanks for reporting, we\'ll look into this.</string>
|
||||
<string name="report_sent_subtitle">While we review this, you can take action against %s.</string>
|
||||
<string name="report_sent_title">Thanks for reporting, we’ll look into this.</string>
|
||||
<string name="report_sent_subtitle">While we review this, you can take action against %s:</string>
|
||||
<string name="unfollow_user">Unfollow %s</string>
|
||||
<string name="unfollow">Unfollow</string>
|
||||
<string name="mute_user_explain">You won\'t see their posts or boosts in your home feed. They won\'t know they\'ve been muted.</string>
|
||||
<string name="block_user_explain">They will no longer be able to follow or see your posts, but they can see if they\'ve been blocked.</string>
|
||||
<string name="report_personal_title">Don\'t want to see this?</string>
|
||||
<string name="report_personal_subtitle">When you see something you don\'t like on Mastodon, you can remove the person from your experience.</string>
|
||||
<string name="mute_user_explain">You will not see their posts. They can still follow you and see your posts and will not know that they are muted.</string>
|
||||
<string name="block_user_explain">You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.</string>
|
||||
<string name="report_personal_title">Don’t want to see this?</string>
|
||||
<string name="report_personal_subtitle">Here are your options for controlling what you see on Mastodon:</string>
|
||||
<string name="back">Back</string>
|
||||
<string name="instance_catalog_title">Mastodon is made of users on different servers.</string>
|
||||
<string name="instance_catalog_subtitle">Pick a server based on your interests, region, or a general purpose one. You can still connect with everyone, regardless of server.</string>
|
||||
@@ -205,12 +205,12 @@
|
||||
<string name="category_tech">Tech</string>
|
||||
<string name="confirm_email_title">Check Your Inbox</string>
|
||||
<!-- %s is the email address -->
|
||||
<string name="confirm_email_subtitle">Tap the link we sent you to verify %s. We\'ll wait right here.</string>
|
||||
<string name="confirm_email_didnt_get">Didn\'t get a link?</string>
|
||||
<string name="confirm_email_subtitle">Tap the link we sent you to verify %s. We’ll wait right here.</string>
|
||||
<string name="confirm_email_didnt_get">Didn’t get a link?</string>
|
||||
<string name="resend">Resend</string>
|
||||
<string name="open_email_app">Open email app</string>
|
||||
<string name="resent_email">Confirmation email sent</string>
|
||||
<string name="compose_hint">Type or paste what\'s on your mind</string>
|
||||
<string name="compose_hint">Type or paste what’s on your mind</string>
|
||||
<string name="content_warning">Content warning</string>
|
||||
<string name="add_image_description">Add image description…</string>
|
||||
<string name="retry_upload">Retry upload</string>
|
||||
@@ -235,8 +235,8 @@
|
||||
<string name="choose_account">Choose account</string>
|
||||
<string name="err_not_logged_in">Please log into Mastodon first</string>
|
||||
<plurals name="cant_add_more_than_x_attachments">
|
||||
<item quantity="one">You can\'t add more than %d media attachment</item>
|
||||
<item quantity="other">You can\'t add more than %d media attachments</item>
|
||||
<item quantity="one">You can’t add more than %d media attachment</item>
|
||||
<item quantity="other">You can’t add more than %d media attachments</item>
|
||||
</plurals>
|
||||
<string name="media_attachment_unsupported_type">File %s is of an unsupported type</string>
|
||||
<string name="media_attachment_too_big">File %1$s exceeds the size limit of %2$s MB</string>
|
||||
@@ -269,8 +269,7 @@
|
||||
<string name="media_cache_cleared">Media cache cleared</string>
|
||||
<string name="confirm_log_out">Log out of %s?</string>
|
||||
<string name="sensitive_content_explain">The author marked this media as sensitive.</string>
|
||||
<string name="media_hidden">Tap to reveal</string>
|
||||
<string name="avatar_description">Go to %s\'s profile</string>
|
||||
<string name="avatar_description">Go to %s’s profile</string>
|
||||
<string name="more_options">More options</string>
|
||||
<string name="reveal_content">Reveal content</string>
|
||||
<string name="hide_content">Hide content</string>
|
||||
@@ -289,7 +288,7 @@
|
||||
<string name="media_viewer">Media viewer</string>
|
||||
<string name="follow_user">Follow %s</string>
|
||||
<string name="unfollowed_user">Unfollowed %s</string>
|
||||
<string name="followed_user">You\'re now following %s</string>
|
||||
<string name="followed_user">You’re now following %s</string>
|
||||
<string name="following_user_requested">Requested to follow %s</string>
|
||||
<string name="open_in_browser">Open in browser</string>
|
||||
<string name="hide_boosts_from_user">Hide boosts from %s</string>
|
||||
@@ -307,7 +306,7 @@
|
||||
<string name="error_saving_file">Error saving file</string>
|
||||
<string name="file_saved">File saved</string>
|
||||
<string name="downloading">Downloading…</string>
|
||||
<string name="no_app_to_handle_action">There\'s no app to handle this action</string>
|
||||
<string name="no_app_to_handle_action">There’s no app to handle this action</string>
|
||||
<string name="local_timeline">Community</string>
|
||||
<string name="trending_posts_info_banner">These are the posts gaining traction in your corner of Mastodon.</string>
|
||||
<string name="trending_hashtags_info_banner">These are the hashtags gaining traction in your corner of Mastodon.</string>
|
||||
@@ -401,7 +400,7 @@
|
||||
<string name="login_title">Welcome Back</string>
|
||||
<string name="login_subtitle">Log in with the server where you created your account.</string>
|
||||
<string name="server_url">Server URL</string>
|
||||
<string name="signup_random_server_explain">We\'ll pick a server based on your language if you continue without making a selection.</string>
|
||||
<string name="signup_random_server_explain">We’ll pick a server based on your language if you continue without making a selection.</string>
|
||||
<string name="server_filter_any_language">Any Language</string>
|
||||
<string name="server_filter_instant_signup">Instant Sign-up</string>
|
||||
<string name="server_filter_manual_review">Manual Review</string>
|
||||
@@ -414,7 +413,7 @@
|
||||
<string name="server_filter_region_oceania">Oceania</string>
|
||||
<string name="not_accepting_new_members">Not accepting new members</string>
|
||||
<string name="category_special_interests">Special Interests</string>
|
||||
<string name="signup_passwords_dont_match">Passwords don\'t match</string>
|
||||
<string name="signup_passwords_dont_match">Passwords don’t match</string>
|
||||
<string name="pick_server_for_me">Pick for me</string>
|
||||
<string name="profile_add_row">Add row</string>
|
||||
<string name="profile_setup">Profile setup</string>
|
||||
@@ -423,14 +422,14 @@
|
||||
<string name="popular_on_mastodon">Popular on Mastodon</string>
|
||||
<string name="follow_all">Follow all</string>
|
||||
<string name="server_rules_disagree">Disagree</string>
|
||||
<string name="privacy_policy_explanation">TL;DR: We don\'t collect or process anything.</string>
|
||||
<string name="privacy_policy_explanation">TL;DR: We don’t collect or process anything.</string>
|
||||
<!-- %s is server domain -->
|
||||
<string name="server_policy_disagree">Disagree with %s</string>
|
||||
<string name="profile_bio">Bio</string>
|
||||
<!-- Shown in a progress dialog when you tap "follow all" -->
|
||||
<string name="sending_follows">Following users…</string>
|
||||
<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
|
||||
<string name="signup_email_domain_blocked">%1$s doesn\'t allow signups from %2$s. Try a different one or <a>pick a different server</a>.</string>
|
||||
<string name="signup_email_domain_blocked">%1$s doesn’t allow signups from %2$s. Try a different one or <a>pick a different server</a>.</string>
|
||||
<string name="signup_username_taken">This username is taken.</string>
|
||||
<string name="spoiler_show">Show anyway</string>
|
||||
<string name="spoiler_hide">Re-hide</string>
|
||||
@@ -482,7 +481,7 @@
|
||||
<string name="edit_post">Edit post</string>
|
||||
<string name="no_verified_link">No verified link</string>
|
||||
<string name="compose_autocomplete_emoji_empty">Browse emoji</string>
|
||||
<string name="compose_autocomplete_users_empty">Find who you\'re looking for</string>
|
||||
<string name="compose_autocomplete_users_empty">Find who you’re looking for</string>
|
||||
<string name="no_search_results">Could not find anything for these search terms</string>
|
||||
<string name="language">Language</string>
|
||||
<string name="language_default">Default</string>
|
||||
@@ -490,4 +489,17 @@
|
||||
<string name="language_detecting">Detecting language</string>
|
||||
<string name="language_cant_detect">Unable to detect language</string>
|
||||
<string name="language_detected">Detected</string>
|
||||
<string name="media_hidden">Media hidden</string>
|
||||
<string name="post_hidden">Post hidden</string>
|
||||
<string name="report_title_post">Report post</string>
|
||||
<string name="forward_report_explanation">The account is from another server. Send an anonymized copy of this report there as well?</string>
|
||||
<!-- %s is the server domain -->
|
||||
<string name="forward_report_to_server">Forward to %s</string>
|
||||
<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
|
||||
<string name="reported">Reported</string>
|
||||
<string name="report_unfollow_explanation">To not see their posts in your home feed anymore, unfollow them.</string>
|
||||
<string name="muted_user">Muted %s</string>
|
||||
<string name="report_sent_already_blocked">You’ve already blocked this user, so there’s nothing else you need to do while we review your report.</string>
|
||||
<string name="report_personal_already_blocked">You’ve already blocked this user, so there’s nothing else you need to do.\n\nThanks for helping keep Mastodon a safe place for everyone!</string>
|
||||
<string name="blocked_user">Blocked %s</string>
|
||||
</resources>
|
||||
@@ -37,6 +37,7 @@
|
||||
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
|
||||
<item name="android:popupMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
|
||||
<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
|
||||
<item name="android:switchStyle">@style/Widget.Mastodon.M3.Switch</item>
|
||||
|
||||
<!-- M3 colors -->
|
||||
<item name="colorM3Primary">@color/m3_sys_light_primary</item>
|
||||
@@ -66,6 +67,7 @@
|
||||
<item name="colorM3ErrorContainer">#F9DEDC</item>
|
||||
<item name="colorM3OnErrorContainer">#410E0B</item>
|
||||
<item name="colorM3PrimaryInverse">@color/m3_sys_dark_primary</item>
|
||||
<item name="colorWhite">#FFF</item>
|
||||
|
||||
<item name="colorWindowBackground">?colorM3Background</item>
|
||||
<item name="android:statusBarColor">?colorM3Background</item>
|
||||
@@ -143,6 +145,7 @@
|
||||
<item name="colorM3ErrorContainer">#8C1D18</item>
|
||||
<item name="colorM3OnErrorContainer">#F9DEDC</item>
|
||||
<item name="colorM3PrimaryInverse">@color/m3_sys_light_primary</item>
|
||||
<item name="colorWhite">#000</item>
|
||||
|
||||
<item name="colorWindowBackground">?colorM3Background</item>
|
||||
<item name="android:statusBarColor">?colorM3Background</item>
|
||||
@@ -358,6 +361,19 @@
|
||||
<item name="android:disabledAlpha">0</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.M3.Switch" parent="">
|
||||
<item name="android:thumb">@drawable/mtrl_switch_thumb</item>
|
||||
<item name="android:track">@drawable/mtrl_switch_track</item>
|
||||
<item name="android:foreground">@drawable/mtrl_switch_track_decoration</item>
|
||||
<!-- <item name="android:paddingLeft">-10dp</item>-->
|
||||
<item name="android:thumbTint">@color/mtrl_switch_thumb_tint</item>
|
||||
<item name="android:trackTint">@color/mtrl_switch_track_tint</item>
|
||||
<item name="android:foregroundTint">@color/mtrl_switch_track_decoration_tint</item>
|
||||
<!-- <item name="android:textOn"></item>-->
|
||||
<!-- <item name="android:textOff"></item>-->
|
||||
<item name="android:showText">false</item>
|
||||
</style>
|
||||
|
||||
<style name="alert_title">
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:textSize">24dp</item>
|
||||
|
||||
112
mastodon/src/main/res/values/tokens.xml
Normal file
112
mastodon/src/main/res/values/tokens.xml
Normal file
@@ -0,0 +1,112 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Copyright (C) 2022 The Android Open Source Project
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
-->
|
||||
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
|
||||
<!-- Version: v0.162 -->
|
||||
|
||||
<resources>
|
||||
|
||||
<!-- Generated from token set (md.sys.motion) in context (platform=android, audience=3p). -->
|
||||
<!-- Easing -->
|
||||
<!-- Easing string used in Material's MotionUtils class. -->
|
||||
<string name="m3_sys_motion_easing_emphasized" translatable="false">path(M 0,0 C 0.05, 0, 0.133333, 0.06, 0.166666, 0.4 C 0.208333, 0.82, 0.25, 1, 1, 1)</string>
|
||||
<!-- Vector path used in <pathInterpolator> resources. -->
|
||||
<string name="m3_sys_motion_easing_emphasized_path_data" translatable="false">M 0,0 C 0.05, 0, 0.133333, 0.06, 0.166666, 0.4 C 0.208333, 0.82, 0.25, 1, 1, 1</string>
|
||||
<!-- Easing string used in Material's MotionUtils class. -->
|
||||
<string name="m3_sys_motion_easing_emphasized_accelerate" translatable="false">cubic-bezier(0.3, 0, 0.8, 0.2)</string>
|
||||
<!-- Control points used in <pathInterpolator> resources. -->
|
||||
<item name="m3_sys_motion_easing_emphasized_accelerate_control_x1" format="float" type="dimen">0.3</item>
|
||||
<item name="m3_sys_motion_easing_emphasized_accelerate_control_y1" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_emphasized_accelerate_control_x2" format="float" type="dimen">0.8</item>
|
||||
<item name="m3_sys_motion_easing_emphasized_accelerate_control_y2" format="float" type="dimen">0.2</item>
|
||||
<!-- Easing string used in Material's MotionUtils class. -->
|
||||
<string name="m3_sys_motion_easing_emphasized_decelerate" translatable="false">cubic-bezier(0.1, 0.7, 0.1, 1)</string>
|
||||
<!-- Control points used in <pathInterpolator> resources. -->
|
||||
<item name="m3_sys_motion_easing_emphasized_decelerate_control_x1" format="float" type="dimen">0.1</item>
|
||||
<item name="m3_sys_motion_easing_emphasized_decelerate_control_y1" format="float" type="dimen">0.7</item>
|
||||
<item name="m3_sys_motion_easing_emphasized_decelerate_control_x2" format="float" type="dimen">0.1</item>
|
||||
<item name="m3_sys_motion_easing_emphasized_decelerate_control_y2" format="float" type="dimen">1</item>
|
||||
<!-- Easing string used in Material's MotionUtils class. -->
|
||||
<string name="m3_sys_motion_easing_standard" translatable="false">cubic-bezier(0.2, 0, 0, 1)</string>
|
||||
<!-- Control points used in <pathInterpolator> resources. -->
|
||||
<item name="m3_sys_motion_easing_standard_control_x1" format="float" type="dimen">0.2</item>
|
||||
<item name="m3_sys_motion_easing_standard_control_y1" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_standard_control_x2" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_standard_control_y2" format="float" type="dimen">1</item>
|
||||
<!-- Easing string used in Material's MotionUtils class. -->
|
||||
<string name="m3_sys_motion_easing_standard_accelerate" translatable="false">cubic-bezier(0.3, 0, 1, 1)</string>
|
||||
<!-- Control points used in <pathInterpolator> resources. -->
|
||||
<item name="m3_sys_motion_easing_standard_accelerate_control_x1" format="float" type="dimen">0.3</item>
|
||||
<item name="m3_sys_motion_easing_standard_accelerate_control_y1" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_standard_accelerate_control_x2" format="float" type="dimen">1</item>
|
||||
<item name="m3_sys_motion_easing_standard_accelerate_control_y2" format="float" type="dimen">1</item>
|
||||
<!-- Easing string used in Material's MotionUtils class. -->
|
||||
<string name="m3_sys_motion_easing_standard_decelerate" translatable="false">cubic-bezier(0, 0, 0, 1)</string>
|
||||
<!-- Control points used in <pathInterpolator> resources. -->
|
||||
<item name="m3_sys_motion_easing_standard_decelerate_control_x1" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_standard_decelerate_control_y1" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_standard_decelerate_control_x2" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_standard_decelerate_control_y2" format="float" type="dimen">1</item>
|
||||
<!-- Easing string used in Material's MotionUtils class. -->
|
||||
<string name="m3_sys_motion_easing_legacy" translatable="false">cubic-bezier(0.4, 0, 0.2, 1)</string>
|
||||
<!-- Control points used in <pathInterpolator> resources. -->
|
||||
<item name="m3_sys_motion_easing_legacy_control_x1" format="float" type="dimen">0.4</item>
|
||||
<item name="m3_sys_motion_easing_legacy_control_y1" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_legacy_control_x2" format="float" type="dimen">0.2</item>
|
||||
<item name="m3_sys_motion_easing_legacy_control_y2" format="float" type="dimen">1</item>
|
||||
<!-- Easing string used in Material's MotionUtils class. -->
|
||||
<string name="m3_sys_motion_easing_legacy_accelerate" translatable="false">cubic-bezier(0.4, 0, 1, 1)</string>
|
||||
<!-- Control points used in <pathInterpolator> resources. -->
|
||||
<item name="m3_sys_motion_easing_legacy_accelerate_control_x1" format="float" type="dimen">0.4</item>
|
||||
<item name="m3_sys_motion_easing_legacy_accelerate_control_y1" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_legacy_accelerate_control_x2" format="float" type="dimen">1</item>
|
||||
<item name="m3_sys_motion_easing_legacy_accelerate_control_y2" format="float" type="dimen">1</item>
|
||||
<!-- Easing string used in Material's MotionUtils class. -->
|
||||
<string name="m3_sys_motion_easing_legacy_decelerate" translatable="false">cubic-bezier(0, 0, 0.2, 1)</string>
|
||||
<!-- Control points used in <pathInterpolator> resources. -->
|
||||
<item name="m3_sys_motion_easing_legacy_decelerate_control_x1" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_legacy_decelerate_control_y1" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_legacy_decelerate_control_x2" format="float" type="dimen">0.2</item>
|
||||
<item name="m3_sys_motion_easing_legacy_decelerate_control_y2" format="float" type="dimen">1</item>
|
||||
<!-- Easing string used in Material's MotionUtils class. -->
|
||||
<string name="m3_sys_motion_easing_linear" translatable="false">cubic-bezier(0, 0, 1, 1)</string>
|
||||
<!-- Control points used in <pathInterpolator> resources. -->
|
||||
<item name="m3_sys_motion_easing_linear_control_x1" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_linear_control_y1" format="float" type="dimen">0</item>
|
||||
<item name="m3_sys_motion_easing_linear_control_x2" format="float" type="dimen">1</item>
|
||||
<item name="m3_sys_motion_easing_linear_control_y2" format="float" type="dimen">1</item>
|
||||
<!-- Duration -->
|
||||
<integer name="m3_sys_motion_duration_short1">50</integer>
|
||||
<integer name="m3_sys_motion_duration_short2">100</integer>
|
||||
<integer name="m3_sys_motion_duration_short3">150</integer>
|
||||
<integer name="m3_sys_motion_duration_short4">200</integer>
|
||||
<integer name="m3_sys_motion_duration_medium1">250</integer>
|
||||
<integer name="m3_sys_motion_duration_medium2">300</integer>
|
||||
<integer name="m3_sys_motion_duration_medium3">350</integer>
|
||||
<integer name="m3_sys_motion_duration_medium4">400</integer>
|
||||
<integer name="m3_sys_motion_duration_long1">450</integer>
|
||||
<integer name="m3_sys_motion_duration_long2">500</integer>
|
||||
<integer name="m3_sys_motion_duration_long3">550</integer>
|
||||
<integer name="m3_sys_motion_duration_long4">600</integer>
|
||||
<integer name="m3_sys_motion_duration_extra_long1">700</integer>
|
||||
<integer name="m3_sys_motion_duration_extra_long2">800</integer>
|
||||
<integer name="m3_sys_motion_duration_extra_long3">900</integer>
|
||||
<integer name="m3_sys_motion_duration_extra_long4">1000</integer>
|
||||
<!-- Style -->
|
||||
<!-- Linear motion path. -->
|
||||
<integer name="m3_sys_motion_path">0</integer>
|
||||
|
||||
</resources>
|
||||
Reference in New Issue
Block a user