Remove unused resources and fix ripple colors
This commit is contained in:
Grishka
@@ -1,21 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<attr name="colorButtonText" format="color"/>
|
||||
<attr name="colorSecondary" format="color"/>
|
||||
<attr name="colorBackgroundLight" format="color"/>
|
||||
<attr name="colorBackgroundLightest" format="color"/>
|
||||
<attr name="colorDarkIcon" format="color"/>
|
||||
<attr name="colorPollMostVoted" format="color"/>
|
||||
<attr name="colorPollVoted" format="color"/>
|
||||
<attr name="colorWindowBackground" format="color"/>
|
||||
<attr name="secondaryButtonStyle" format="reference"/>
|
||||
<attr name="buttonBackground" format="reference"/>
|
||||
<attr name="colorAccentLight" format="color"/>
|
||||
<attr name="colorSearchField" format="color"/>
|
||||
<attr name="colorSearchHint" format="color"/>
|
||||
<attr name="colorTabInactive" format="color"/>
|
||||
<attr name="colorAccentLightest" format="color"/>
|
||||
|
||||
<attr name="colorM3Primary" format="color"/>
|
||||
<attr name="colorM3OnPrimary" format="color"/>
|
||||
<attr name="colorM3PrimaryContainer" format="color"/>
|
||||
@@ -50,9 +34,6 @@
|
||||
<attr name="colorFollow" format="color" />
|
||||
<attr name="colorPoll" format="color" />
|
||||
|
||||
<attr name="primaryLargeButtonStyle" format="reference"/>
|
||||
<attr name="secondaryLargeButtonStyle" format="reference"/>
|
||||
|
||||
<declare-styleable name="MaxWidthFrameLayout">
|
||||
<attr name="android:maxWidth" format="dimension"/>
|
||||
</declare-styleable>
|
||||
|
||||
@@ -1,98 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="black">#FF000000</color>
|
||||
<color name="white">#FFFFFFFF</color>
|
||||
|
||||
<color name="fluent_default_icon_tint">?android:textColorPrimary</color>
|
||||
|
||||
<color name="gray_900">#121029</color>
|
||||
<color name="gray_800t">#cc2b2938</color>
|
||||
<color name="gray_800">#2b2938</color>
|
||||
<color name="gray_700">#353454</color>
|
||||
<color name="gray_600">#464666</color>
|
||||
<color name="gray_500">#696685</color>
|
||||
<color name="gray_400">#9998b3</color>
|
||||
<color name="gray_300">#d1d1de</color>
|
||||
<color name="gray_200">#e6e6ed</color>
|
||||
<color name="gray_100">#f2f2f7</color>
|
||||
<color name="gray_50t">#ccf5f5f9</color>
|
||||
<color name="gray_50">#f5f5f9</color>
|
||||
<color name="gray_25">#f7f8fa</color>
|
||||
|
||||
<color name="primary_25">#fafaff</color>
|
||||
<color name="primary_50">#f4f3ff</color>
|
||||
<color name="primary_100">#ebebff</color>
|
||||
<color name="primary_200">#d7d7ff</color>
|
||||
<color name="primary_300">#c2c2ff</color>
|
||||
<color name="primary_400">#9999ff</color>
|
||||
<color name="primary_500">#6364ff</color>
|
||||
<color name="primary_600">#562cfc</color>
|
||||
<color name="primary_700">#431cbb</color>
|
||||
<color name="primary_800">#2f0c7a</color>
|
||||
<color name="primary_900">#17063b</color>
|
||||
<color name="error_25">#FFFBFA</color>
|
||||
<color name="error_50">#FEF3F2</color>
|
||||
<color name="error_100">#FEE4E2</color>
|
||||
<color name="error_200">#FECDCA</color>
|
||||
<color name="error_300">#FDA29B</color>
|
||||
<color name="error_400">#F97066</color>
|
||||
<color name="error_500">#F04438</color>
|
||||
<color name="error_600">#D92D20</color>
|
||||
<color name="error_700">#B42318</color>
|
||||
<color name="error_800">#912018</color>
|
||||
<color name="error_900">#7A271A</color>
|
||||
<color name="warning_25">#FFFCF5</color>
|
||||
<color name="warning_50">#FFFAEB</color>
|
||||
<color name="warning_100">#FEF0C7</color>
|
||||
<color name="warning_200">#FEDF89</color>
|
||||
<color name="warning_300">#FEC84B</color>
|
||||
<color name="warning_400">#FDB022</color>
|
||||
<color name="warning_500">#F79009</color>
|
||||
<color name="warning_600">#DC6803</color>
|
||||
<color name="warning_700">#B54708</color>
|
||||
<color name="warning_800">#93370D</color>
|
||||
<color name="warning_900">#7A2E0E</color>
|
||||
<color name="success_25">#F6FEF9</color>
|
||||
<color name="success_50">#ECFDF3</color>
|
||||
<color name="success_100">#D1FADF</color>
|
||||
<color name="success_200">#A6F4C5</color>
|
||||
<color name="success_300">#6CE9A6</color>
|
||||
<color name="success_400">#32D583</color>
|
||||
<color name="success_500">#12B76A</color>
|
||||
<color name="success_600">#039855</color>
|
||||
<color name="success_700">#027A48</color>
|
||||
<color name="success_800">#05603A</color>
|
||||
<color name="success_900">#054F31</color>
|
||||
<color name="slate_25">#FCFCFD</color>
|
||||
<color name="slate_50">#F8FAFC</color>
|
||||
<color name="slate_100">#EAEFF5</color>
|
||||
<color name="slate_200">#C8D4E5</color>
|
||||
<color name="slate_300">#9EB3D1</color>
|
||||
<color name="slate_400">#7190BC</color>
|
||||
<color name="slate_500">#4E73A6</color>
|
||||
<color name="slate_600">#3E5B84</color>
|
||||
<color name="slate_700">#364F72</color>
|
||||
<color name="slate_800">#293C56</color>
|
||||
<color name="slate_900">#101823</color>
|
||||
<color name="purple_25">#FAFAFF</color>
|
||||
<color name="purple_50">#F4F3FF</color>
|
||||
<color name="purple_100">#EBE9FE</color>
|
||||
<color name="purple_200">#D9D6FE</color>
|
||||
<color name="purple_300">#BDB4FE</color>
|
||||
<color name="purple_400">#9B8AFB</color>
|
||||
<color name="purple_500">#7A5AF8</color>
|
||||
<color name="purple_600">#6938EF</color>
|
||||
<color name="purple_700">#5925DC</color>
|
||||
<color name="purple_800">#4A1FB8</color>
|
||||
<color name="purple_900">#3E1C96</color>
|
||||
|
||||
<color name="fab_icon">#282C37</color>
|
||||
<color name="navigation_bar_bg_light">#282C37</color>
|
||||
<color name="highlight_over_dark">#30FFFFFF</color>
|
||||
<color name="highlight_over_light">#18000000</color>
|
||||
|
||||
<color name="favorite_selected">@color/warning_500</color>
|
||||
<color name="boost_selected">@color/primary_500</color>
|
||||
|
||||
<color name="shortcut_icon_background">#FFF</color>
|
||||
<color name="shortcut_icon_foreground">@color/m3_sys_light_primary</color>
|
||||
@@ -143,4 +54,5 @@
|
||||
<color name="m3_sys_dark_outline">#938F99</color>
|
||||
<color name="m3_sys_dark_outline_variant">#49454F</color>
|
||||
|
||||
<item name="overlay_ripple_alpha" format="float" type="dimen">0.12</item>
|
||||
</resources>
|
||||
@@ -2,8 +2,6 @@
|
||||
<resources>
|
||||
<string name="app_name" translatable="false">Mastodon</string>
|
||||
|
||||
<string name="get_started">Create account</string>
|
||||
<string name="already_have_account">I already have an account</string>
|
||||
<string name="log_in">Log in</string>
|
||||
<string name="next">Next</string>
|
||||
<string name="loading_instance">Retrieving server info…</string>
|
||||
@@ -22,11 +20,6 @@
|
||||
<string name="notification_boosted">%s boosted your post</string>
|
||||
<string name="poll_ended">See the results of a poll you voted in</string>
|
||||
|
||||
<string name="time_seconds">%ds</string>
|
||||
<string name="time_minutes">%dm</string>
|
||||
<string name="time_hours">%dh</string>
|
||||
<string name="time_days">%dd</string>
|
||||
|
||||
<string name="share_toot_title">Share</string>
|
||||
<string name="settings">Settings</string>
|
||||
<string name="publish">Publish</string>
|
||||
@@ -42,10 +35,6 @@
|
||||
<item quantity="one">following</item>
|
||||
<item quantity="other">following</item>
|
||||
</plurals>
|
||||
<plurals name="posts">
|
||||
<item quantity="one">post</item>
|
||||
<item quantity="other">posts</item>
|
||||
</plurals>
|
||||
<string name="posts">Posts</string>
|
||||
<string name="posts_and_replies">Posts and Replies</string>
|
||||
<string name="media">Media</string>
|
||||
@@ -53,7 +42,6 @@
|
||||
<string name="button_follow">Follow</string>
|
||||
<string name="button_following">Following</string>
|
||||
<string name="edit_profile">Edit Profile</string>
|
||||
<string name="mention_user">Mention %s</string>
|
||||
<string name="share_user">Share profile</string>
|
||||
<string name="mute_user">Mute %s</string>
|
||||
<string name="unmute_user">Unmute %s</string>
|
||||
@@ -86,7 +74,6 @@
|
||||
<item quantity="one">%d day</item>
|
||||
<item quantity="other">%d days</item>
|
||||
</plurals>
|
||||
<string name="compose_poll_duration">Duration: %s</string>
|
||||
<plurals name="x_seconds_left">
|
||||
<item quantity="one">%d second left</item>
|
||||
<item quantity="other">%d seconds left</item>
|
||||
@@ -122,10 +109,8 @@
|
||||
<string name="confirm_unblock_domain_title">Unblock Domain</string>
|
||||
<string name="confirm_unblock">Confirm to unblock %s</string>
|
||||
<string name="do_unblock">Unblock</string>
|
||||
<string name="button_muted">Muted</string>
|
||||
<string name="button_blocked">Blocked</string>
|
||||
<string name="action_vote">Vote</string>
|
||||
<string name="tap_to_reveal">Tap to reveal</string>
|
||||
<string name="delete">Delete</string>
|
||||
<string name="confirm_delete_title">Delete post</string>
|
||||
<string name="confirm_delete">Are you sure you want to delete this post?</string>
|
||||
@@ -145,10 +130,6 @@
|
||||
<item quantity="one">%d person is talking</item>
|
||||
<item quantity="other">%d people are talking</item>
|
||||
</plurals>
|
||||
<plurals name="discussed_x_times">
|
||||
<item quantity="one">Discussed %d time</item>
|
||||
<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>
|
||||
@@ -177,13 +158,10 @@
|
||||
<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>
|
||||
<string name="search_communities">Server name or URL</string>
|
||||
<string name="instance_rules_title">Server Rules</string>
|
||||
<string name="instance_rules_subtitle">By continuing, you agree to follow by the following rules set and enforced by the %s moderators.</string>
|
||||
<string name="signup_title">Create Account</string>
|
||||
<string name="edit_photo">edit</string>
|
||||
<string name="display_name">Name</string>
|
||||
<string name="username">Username</string>
|
||||
<string name="email">Email</string>
|
||||
@@ -212,20 +190,12 @@
|
||||
<string name="resent_email">Confirmation email sent</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>
|
||||
<string name="edit_image">Edit image</string>
|
||||
<string name="save">Save</string>
|
||||
<string name="add_alt_text">Add alt text</string>
|
||||
<string name="alt_text_subtitle">Alt text describes your photos for people with low or no vision. Try to only include enough detail to understand the context.</string>
|
||||
<string name="alt_text_hint">e.g. A dog looking around suspiciously with narrowed eyes at the camera.</string>
|
||||
<string name="visibility_public">Public</string>
|
||||
<string name="visibility_followers_only">Followers only</string>
|
||||
<string name="visibility_private">Only people mentioned</string>
|
||||
<string name="search_all">All</string>
|
||||
<string name="search_people">People</string>
|
||||
<string name="recent_searches">Recents</string>
|
||||
<string name="step_x_of_n">Step %1$d of %2$d</string>
|
||||
<string name="skip">Skip</string>
|
||||
<string name="notification_type_follow">New followers</string>
|
||||
<string name="notification_type_favorite">Favorites</string>
|
||||
@@ -244,26 +214,13 @@
|
||||
<string name="theme_auto">Use device appearance</string>
|
||||
<string name="theme_light">Light</string>
|
||||
<string name="theme_dark">Dark</string>
|
||||
<string name="theme_true_black">True black mode</string>
|
||||
<string name="settings_behavior">Behavior</string>
|
||||
<string name="settings_gif">Play animated avatars and emoji</string>
|
||||
<string name="settings_custom_tabs">Use in-app browser</string>
|
||||
<string name="settings_notifications">Notifications</string>
|
||||
<string name="notify_me_when">Notify me when</string>
|
||||
<string name="notify_anyone">anyone</string>
|
||||
<string name="notify_follower">a follower</string>
|
||||
<string name="notify_followed">someone I follow</string>
|
||||
<string name="notify_none">no one</string>
|
||||
<string name="notify_favorites">Favorites my post</string>
|
||||
<string name="notify_follow">Follows me</string>
|
||||
<string name="notify_reblog">Boosts my post</string>
|
||||
<string name="notify_mention">Mentions me</string>
|
||||
<string name="settings_boring">The boring zone</string>
|
||||
<string name="settings_account">Account settings</string>
|
||||
<string name="settings_contribute">Contribute to Mastodon</string>
|
||||
<string name="settings_tos">Terms of service</string>
|
||||
<string name="settings_privacy_policy">Privacy policy</string>
|
||||
<string name="settings_spicy">The spicy zone</string>
|
||||
<string name="settings_clear_cache">Clear media cache</string>
|
||||
<string name="settings_app_version">Mastodon for Android v%1$s (%2$d)</string>
|
||||
<string name="media_cache_cleared">Media cache cleared</string>
|
||||
@@ -271,8 +228,6 @@
|
||||
<string name="sensitive_content_explain">The author marked this media as sensitive.</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>
|
||||
<string name="new_post">New post</string>
|
||||
<string name="button_reply">Reply</string>
|
||||
<string name="button_reblog">Boost</string>
|
||||
@@ -282,7 +237,6 @@
|
||||
<string name="add_media">Add media</string>
|
||||
<string name="add_poll">Add a poll</string>
|
||||
<string name="emoji">Emoji</string>
|
||||
<string name="post_visibility">Post visibility</string>
|
||||
<string name="home_timeline">Home timeline</string>
|
||||
<string name="my_profile">My profile</string>
|
||||
<string name="media_viewer">Media viewer</string>
|
||||
@@ -313,15 +267,12 @@
|
||||
<!-- %s is the server domain -->
|
||||
<string name="local_timeline_info_banner">These are all the posts from all users in your server (%s).</string>
|
||||
<string name="recommended_accounts_info_banner">You might like these accounts based on others you follow.</string>
|
||||
<string name="dismiss">Dismiss</string>
|
||||
<string name="see_new_posts">See new posts</string>
|
||||
<string name="load_missing_posts">Load missing posts</string>
|
||||
<string name="follow_back">Follow Back</string>
|
||||
<string name="button_follow_pending">Pending</string>
|
||||
<string name="follows_you">Follows you</string>
|
||||
<string name="manually_approves_followers">Manually approves followers</string>
|
||||
<string name="current_account">Current account</string>
|
||||
<string name="log_out_account">Log Out %s</string>
|
||||
|
||||
<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
|
||||
<plurals name="x_followers">
|
||||
@@ -342,8 +293,6 @@
|
||||
</plurals>
|
||||
<string name="timestamp_via_app">%1$s via %2$s</string>
|
||||
<string name="time_now">now</string>
|
||||
<string name="post_info_reblogs">Boosts</string>
|
||||
<string name="post_info_favorites">Favorites</string>
|
||||
<string name="edit_history">Edit history</string>
|
||||
<string name="last_edit_at_x">Last edit %s</string>
|
||||
<string name="time_just_now">just now</string>
|
||||
@@ -377,14 +326,9 @@
|
||||
<string name="file_size_kb">%.2f KB</string>
|
||||
<string name="file_size_mb">%.2f MB</string>
|
||||
<string name="file_size_gb">%.2f GB</string>
|
||||
<string name="file_upload_progress">%1$s of %2$s</string>
|
||||
<string name="file_upload_time_remaining">%s remaining</string>
|
||||
<string name="upload_error_connection_lost">Your device lost connection to the internet</string>
|
||||
<string name="upload_processing">Processing…</string>
|
||||
<!-- %s is version like 1.2.3 -->
|
||||
<string name="update_available">Mastodon for Android %s is ready to download.</string>
|
||||
<!-- %s is version like 1.2.3 -->
|
||||
<string name="update_ready">Mastodon for Android %s is downloaded and ready to install.</string>
|
||||
<!-- %s is file size -->
|
||||
<string name="download_update">Download (%s)</string>
|
||||
<string name="install_update">Install</string>
|
||||
@@ -431,7 +375,6 @@
|
||||
<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_username_taken">This username is taken.</string>
|
||||
<string name="spoiler_show">Show anyway</string>
|
||||
<string name="spoiler_hide">Re-hide</string>
|
||||
<string name="poll_multiple_choice">Choose one or more</string>
|
||||
@@ -506,7 +449,6 @@
|
||||
<string name="mark_all_notifications_read">Mark all as read</string>
|
||||
<string name="settings_display">Display</string>
|
||||
<string name="settings_filters">Filters</string>
|
||||
<string name="settings_privacy"><![CDATA[Privacy & safety]]></string>
|
||||
<string name="settings_server_explanation">Overview, rules, moderators</string>
|
||||
<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
|
||||
<string name="about_app">About %s</string>
|
||||
|
||||
@@ -5,33 +5,12 @@
|
||||
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
|
||||
<item name="android:enforceStatusBarContrast" tools:ignore="NewApi">false</item>
|
||||
<item name="android:splitMotionEvents">false</item>
|
||||
<item name="android:windowBackground">?colorWindowBackground</item>
|
||||
<item name="android:windowBackground">@color/m3_sys_light_surface</item>
|
||||
<item name="android:editTextStyle">@style/Widget.Mastodon.EditText</item>
|
||||
|
||||
<item name="android:buttonStyle">@style/Widget.Mastodon.Button.Primary_DarkOnLight</item>
|
||||
<item name="secondaryButtonStyle">@style/Widget.Mastodon.Button.Secondary_DarkOnLight</item>
|
||||
<item name="primaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Primary_DarkOnLight</item>
|
||||
<item name="secondaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Secondary_DarkOnLight</item>
|
||||
<item name="android:colorPrimary">@color/gray_800</item>
|
||||
<item name="android:colorBackground">@color/gray_100</item>
|
||||
<item name="android:textColorPrimary">@color/gray_800</item>
|
||||
<item name="android:textColorSecondary">@color/gray_500</item>
|
||||
<item name="colorButtonText">@color/gray_50</item>
|
||||
<item name="colorSecondary">#E9EDF2</item>
|
||||
<item name="colorBackgroundLight">@color/gray_50</item>
|
||||
<item name="colorBackgroundLightest">@color/gray_25</item>
|
||||
<item name="colorDarkIcon">@color/gray_900</item>
|
||||
<item name="android:buttonStyle">@style/Widget.Mastodon.M3.Button</item>
|
||||
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
|
||||
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert</item>
|
||||
<item name="colorPollMostVoted">@color/primary_500</item>
|
||||
<item name="colorPollVoted">@color/gray_300</item>
|
||||
<item name="colorAccentLight">@color/primary_600</item>
|
||||
<item name="colorSearchField">@color/gray_200</item>
|
||||
<item name="colorSearchHint">@color/gray_600</item>
|
||||
<item name="colorTabInactive">@color/gray_400</item>
|
||||
<item name="colorAccentLightest">@color/primary_100</item>
|
||||
|
||||
<item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item>
|
||||
|
||||
<item name="android:windowLightStatusBar">true</item>
|
||||
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
|
||||
@@ -77,12 +56,13 @@
|
||||
<item name="colorFollow">#4746e3</item>
|
||||
<item name="colorPoll">#006d42</item>
|
||||
|
||||
<item name="colorWindowBackground">?colorM3Background</item>
|
||||
<item name="android:statusBarColor">?colorM3Background</item>
|
||||
<item name="android:navigationBarColor">@color/navigation_bar_bg_light</item>
|
||||
<item name="android:colorAccent">?colorM3Primary</item>
|
||||
<item name="android:colorControlHighlight">@color/m3_on_surface_overlay</item>
|
||||
<item name="colorSensitiveOverlay">#a6ffffff</item>
|
||||
<item name="android:textColorPrimary">?colorM3OnSurface</item>
|
||||
<item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.Dark" parent="Theme.AppKit">
|
||||
@@ -90,35 +70,12 @@
|
||||
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
|
||||
<item name="android:enforceStatusBarContrast" tools:ignore="NewApi">false</item>
|
||||
<item name="android:splitMotionEvents">false</item>
|
||||
<item name="android:windowBackground">?colorWindowBackground</item>
|
||||
<item name="android:windowBackground">@color/m3_sys_dark_surface</item>
|
||||
<item name="android:editTextStyle">@style/Widget.Mastodon.EditText</item>
|
||||
|
||||
<item name="android:buttonStyle">@style/Widget.Mastodon.Button.Primary_LightOnDark</item>
|
||||
<item name="secondaryButtonStyle">@style/Widget.Mastodon.Button.Secondary_LightOnDark</item>
|
||||
<item name="primaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Primary_LightOnDark</item>
|
||||
<item name="secondaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Secondary_LightOnDark</item>
|
||||
<item name="android:colorPrimary">@color/gray_50</item>
|
||||
<item name="android:colorBackground">@color/gray_700</item>
|
||||
<item name="android:textColorPrimary">@color/gray_50</item>
|
||||
<item name="android:textColorSecondary">@color/gray_400</item>
|
||||
<item name="colorButtonText">@color/gray_800</item>
|
||||
<item name="colorSecondary">#E9EDF2</item>
|
||||
<item name="colorBackgroundLight">@color/gray_700</item>
|
||||
<item name="colorBackgroundLightest">@color/gray_900</item>
|
||||
<item name="colorDarkIcon">@color/gray_25</item>
|
||||
<item name="android:buttonStyle">@style/Widget.Mastodon.M3.Button</item>
|
||||
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
|
||||
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark</item>
|
||||
<item name="colorPollMostVoted">@color/primary_700</item>
|
||||
<item name="colorPollVoted">@color/gray_600</item>
|
||||
<item name="colorAccentLight">@color/primary_600</item>
|
||||
<item name="colorAccentLightest">@color/primary_800</item>
|
||||
<item name="colorTabInactive">@color/gray_400</item>
|
||||
|
||||
<!-- TODO dark colors -->
|
||||
<item name="colorSearchField">@color/gray_700</item>
|
||||
<item name="colorSearchHint">@color/gray_300</item>
|
||||
|
||||
<item name="buttonBackground">@drawable/bg_button_primary_light_on_dark</item>
|
||||
|
||||
<item name="android:windowLightStatusBar">false</item>
|
||||
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
|
||||
@@ -163,12 +120,13 @@
|
||||
<item name="colorFollow">#c1c1ff</item>
|
||||
<item name="colorPoll">#77daa1</item>
|
||||
|
||||
<item name="colorWindowBackground">?colorM3Background</item>
|
||||
<item name="android:statusBarColor">?colorM3Background</item>
|
||||
<item name="android:navigationBarColor">?colorM3Background</item>
|
||||
<item name="android:colorAccent">?colorM3Primary</item>
|
||||
<item name="android:colorControlHighlight">@color/m3_on_surface_overlay</item>
|
||||
<item name="colorSensitiveOverlay">#80000000</item>
|
||||
<item name="android:textColorPrimary">?colorM3OnSurface</item>
|
||||
<item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.Dark.SplashFragment">
|
||||
@@ -179,7 +137,6 @@
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Light"/>
|
||||
<style name="Theme.Mastodon.AutoLightDark.TrueBlack" parent="Theme.Mastodon.Light"/>
|
||||
|
||||
<style name="Theme.Mastodon.Toolbar" parent="android:ThemeOverlay.Material.ActionBar">
|
||||
<item name="android:colorPrimary">?colorM3Background</item>
|
||||
@@ -217,70 +174,14 @@
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.Toolbar.Profile">
|
||||
<item name="android:textColorPrimary">@color/gray_50</item>
|
||||
<item name="android:textColorSecondary">@color/gray_50</item>
|
||||
<item name="android:drawableTint">@color/gray_50</item>
|
||||
<item name="android:textColorPrimary">#fff</item>
|
||||
<item name="android:textColorSecondary">#fff</item>
|
||||
<item name="android:drawableTint">#fff</item>
|
||||
<item name="android:popupTheme">@style/Theme.Mastodon.AutoLightDark</item>
|
||||
<item name="android:titleTextAppearance">@style/m3_title_medium</item>
|
||||
<item name="android:titleTextColor">@color/gray_50</item>
|
||||
<item name="android:titleTextColor">#fff</item>
|
||||
<item name="android:subtitleTextAppearance">@style/m3_body_medium</item>
|
||||
<item name="android:subtitleTextColor">@color/gray_50</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.Button" parent="android:Widget.Material.Button">
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textAppearance">@style/m3_label_large</item>
|
||||
<item name="android:minHeight">36dp</item>
|
||||
<item name="android:minWidth">0px</item>
|
||||
<item name="android:paddingLeft">16dp</item>
|
||||
<item name="android:paddingRight">16dp</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.Button.Large">
|
||||
<item name="android:minHeight">56dp</item>
|
||||
<item name="android:paddingLeft">32dp</item>
|
||||
<item name="android:paddingRight">32dp</item>
|
||||
<item name="android:textAppearance">@style/m3_title_medium</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.Button.Primary_DarkOnLight">
|
||||
<item name="android:background">@drawable/bg_button_primary_dark_on_light</item>
|
||||
<item name="android:textColor">@color/button_text_primary_dark_on_light</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.Button.Secondary_DarkOnLight">
|
||||
<item name="android:background">@drawable/bg_button_secondary_dark_on_light</item>
|
||||
<item name="android:textColor">@color/button_text_secondary_dark_on_light</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.Button.Primary_LightOnDark">
|
||||
<item name="android:background">@drawable/bg_button_primary_light_on_dark</item>
|
||||
<item name="android:textColor">@color/button_text_primary_light_on_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.Button.Secondary_LightOnDark">
|
||||
<item name="android:background">@drawable/bg_button_secondary_light_on_dark</item>
|
||||
<item name="android:textColor">@color/button_text_secondary_light_on_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.Button.Large.Primary_DarkOnLight">
|
||||
<item name="android:background">@drawable/bg_button_primary_dark_on_light</item>
|
||||
<item name="android:textColor">@color/button_text_primary_dark_on_light</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.Button.Large.Secondary_DarkOnLight">
|
||||
<item name="android:background">@drawable/bg_button_secondary_dark_on_light</item>
|
||||
<item name="android:textColor">@color/button_text_secondary_dark_on_light</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.Button.Large.Primary_LightOnDark">
|
||||
<item name="android:background">@drawable/bg_button_primary_light_on_dark</item>
|
||||
<item name="android:textColor">@color/button_text_primary_light_on_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.Button.Large.Secondary_LightOnDark">
|
||||
<item name="android:background">@drawable/bg_button_secondary_light_on_dark</item>
|
||||
<item name="android:textColor">@color/button_text_secondary_light_on_dark</item>
|
||||
<item name="android:subtitleTextColor">#fff</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Mastodon.EditText" parent="android:Widget.Material.Light.EditText">
|
||||
@@ -428,7 +329,6 @@
|
||||
</style>
|
||||
|
||||
<style name="alert_title">
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:textSize">24dp</item>
|
||||
<item name="android:minHeight">38dp</item>
|
||||
<item name="android:gravity">bottom</item>
|
||||
@@ -438,71 +338,60 @@
|
||||
|
||||
<style name="m3_body_large">
|
||||
<item name="android:textSize">16dp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:lineSpacingExtra">5dp</item>
|
||||
<item name="android:lineHeight">24dp</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_body_medium">
|
||||
<item name="android:textSize">14dp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:lineSpacingExtra">4dp</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_body_small">
|
||||
<item name="android:textSize">12dp</item>
|
||||
<item name="android:textColor">?android:textColorSecondary</item>
|
||||
<item name="android:lineSpacingExtra">2dp</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_title_medium">
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textSize">16dp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:lineSpacingExtra">5dp</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_title_small">
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textSize">14dp</item>
|
||||
<item name="android:textColor">?android:textColorSecondary</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_label_small">
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textSize">11dp</item>
|
||||
<item name="android:textColor">?android:textColorSecondary</item>
|
||||
<item name="android:lineSpacingExtra">3dp</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_label_medium">
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textSize">12dp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:lineSpacingMultiplier">1.14</item>
|
||||
<item name="android:lineHeight">16dp</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_label_large">
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textColor">?android:textColorSecondary</item>
|
||||
<item name="android:textSize">14dp</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_title_large">
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textSize">22dp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_headline_small">
|
||||
<item name="android:textSize">24dp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_headline_medium">
|
||||
<item name="android:textSize">28dp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:lineSpacingExtra">3dp</item>
|
||||
</style>
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
<!-- <item name="tabIconTint">@color/m3_tabs_icon_color</item>-->
|
||||
<!-- <item name="tabTextAppearance">?android:attr/textAppearanceLabelLarge</item>-->
|
||||
<!-- <item name="tabTextColor">@color/m3_tabs_icon_color</item>-->
|
||||
<item name="tabIndicator">@drawable/m3_tabs_rounded_line_indicator</item>
|
||||
<!-- <item name="tabIndicator">@drawable/m3_tabs_rounded_line_indicator</item>-->
|
||||
<item name="tabIndicatorAnimationMode">elastic</item>
|
||||
<item name="tabIndicatorColor">?android:attr/colorPrimary</item>
|
||||
<!-- <item name="tabRippleColor">@color/m3_tabs_ripple_color</item>-->
|
||||
@@ -94,7 +94,7 @@
|
||||
present in the UI. This style does not have a bottom divider, which is added in v21 because
|
||||
the drawable cannot use theme colors pre-21. -->
|
||||
<style name="Base.Widget.Material3.TabLayout.Secondary" parent="Widget.Material3.TabLayout">
|
||||
<item name="tabIndicator">@drawable/m3_tabs_line_indicator</item>
|
||||
<!-- <item name="tabIndicator">@drawable/m3_tabs_line_indicator</item>-->
|
||||
<item name="tabIndicatorFullWidth">true</item>
|
||||
</style>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user