Merge upstream redesign (#714)

* merge toolbar fragment

* Fix store screenshot generator

* Fix alert color

* Fix #609

* Fix crash

* bigger hitbox for chips

* support mastodon languages

* merge ui utils

* merge stuff

* fix icon

* ensure 48dp touch target

* init local prefs, add helper function for enum values

* update compose action layout

* merge compose-adj files

* update extended footer

* fix poll wrong option checked

closes sk22#641

* no border when disabled

closes sk22#640

* Fix #610

* Minor fixes

* Fix alert color

* Fix #609

* Fix crash

* Fix #610

* Minor fixes

* add resources

* more compatible mastodon language

* fix html parser

* mark as read on refresh

* update tab bar

* tweak m3 buttons

* update compose-adj files

* tweak and update styles

* m3 expand button

* flag icon should be 18dp, actually

* More minor fixes

closes #612

* More minor fixes

closes #612

* Bump version

* fix no create status event when redrafting

* add material 3 assets

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (Italian)

* New translations strings.xml (Thai)

* New translations strings.xml (Thai)

* New translations strings.xml (Italian)

* New translations strings.xml (Thai)

* use new buttons for profile fragment

* merge compose fragment

* merge all the styles! oh dear

* New translations full_description.txt (Indonesian)

* New translations full_description.txt (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations full_description.txt (Chinese Simplified)

* Fix #615

* Minor fixes

* Fix #611

* A bunch of crash fixes

* New translations strings.xml (Greek)

* Make the default server configurable

* Pass the system timezone to server when signing up

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Japanese)

* Fix #615

* Minor fixes

* Fix #611

* A bunch of crash fixes

* Make the default server configurable

* Pass the system timezone to server when signing up

* oops. accidentally pasted the commit message in the code

* Remove unused code that caused a crash for some users ¯\_(ツ)_/¯

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* Remove unused code that caused a crash for some users ¯\_(ツ)_/¯

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Belarusian)

* prepare merging profile fragment

* merge profile fragment

* New translations strings.xml (Belarusian)

* New translations strings.xml (Greek)

* fix icon padding

* apply post header changes

* minor margin tweaks

* fix footer buttons

* fix header announcement buttons

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations full_description.txt (Japanese)

* New translations strings.xml (Icelandic)

* New translations strings.xml (Icelandic)

* New translations strings.xml (Icelandic)

* fix replying

* New translations strings.xml (Icelandic)

* fix translate button

* fix more button visibility

* fix counts label styling

* fix disabled boost button opacity

* fix tab layouts

* fix notification icon color crash

* New translations strings.xml (Greek)

* implement elevation listener in home tab

* fix elevation and listener in home tab

* add elevation scroll listener to notifications

* New translations strings.xml (Scottish Gaelic)

* Add editorconfig

So that PRs like #625 don't happen again

* Crash fix

* 🤔

* New translations strings.xml (Greek)

* New translations strings.xml (Japanese)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* fix notification elevation and integrate divider

* 🤔

* Crash fix

* Add editorconfig

So that PRs like #625 don't happen again

* New translations strings.xml (Turkish)

* save interactions in cache

* New translations strings.xml (Turkish)

* merge new discover/search

* New translations strings.xml (Bengali)

* New translations strings.xml (Scottish Gaelic)

* New translations strings.xml (Bengali)

* merge new settings fragments

* fix no auth callback always being executed

* allow opening server info from profile

closes sk22#593

* fix hide boosts icon color

closes sk22#676

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Turkish)

* update fedinuke list

from source; doesn't contain any modifications regarding a recent issue

* New translations strings.xml (Turkish)

* remove unused class

* fix crash

* darken m3 outline color a bit

* use m3 outline again

* fix misalignment

closes sk22#682

* New translations strings.xml (Turkish)

* New translations full_description.txt (Turkish)

* New translations short_description.txt (Turkish)

* fix crash

* fix metadata sorting

* show pronouns in header/account lists

* fix broken divider line

closes sk22#679

* trim pronouns

* improve pronoun display

* New translations strings.xml (French)

* New translations strings.xml (Japanese)

* fix broken federated timeline

closes sk22#685

* fix broken -1 fallback behavior

closes sk22#681

* don't display nothing if server about request fails

closes sk22#678

* New translations strings.xml (Ukrainian)

* migrate global prefs to local prefs

* do confirm unfollow by default

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations full_description.txt (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Russian)

* New translations strings.xml (Vietnamese)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Vietnamese)

* New translations full_description.txt (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Vietnamese)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* make sure list in prefs are always mutable and nut null

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Russian)

* fix pronouns edge case

* add back fix for stretched images

closes sk22#636

* fix null pointer on missing default posting language

* fix default posting language not being applied

* bigger username hitbox

closes sk22#688

* fix rtl header username alignment

closes sk22#689

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* hopefully fix crashes

closes sk22#692

* New translations strings.xml (Ukrainian)

* New translations full_description.txt (Ukrainian)

* fix pronoun crash

* New translations strings.xml (Persian)

* New translations strings.xml (Ukrainian)

* re-add true black mode

* asterisk can be a pronoun

* New translations strings.xml (Persian)

* true black mode fixes and clean-ups

* material 3 button background for switcher

* darker tab bar selected background

* better align follow/following button widths

* restore rainbow refresh colors

* fix search transition

* fix min width issue with switcher button

* fix no elevation when true black is enabled in light theme

* use statusForContent to determine spoilerRevealed

closes sk22#694

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* fix profile tab bar in true black theme

* fix m3 default button style

closes sk22#697

* prettier role badges

closes sk22#663

* fix translate button spacing

closes sk22#655

* use m3 switches in dialogs

closes sk22#653

* implement color palette switcher

* fix color palettes being overwritten

* add display and notification settings

* clean up code

* per-account single notification setting

* add missing items to notification types

* add prefix replies setting

* add show replies/boosts and reply visibility

* add load/see new posts settings

* fix spectator mode missing spoiler padding

* add a bunch of display settings

* update fedinuke

* add content type settings

* add settings for local-onlu

* add missing settings items

* fix visibility button icon tint

* hopefully fix some crashes

* normalize padding above edit text

* apparently, some people don't like pills

closes sk22#706

* fix play button color

closes sk22#705
This commit is contained in:
sk22
2023-07-16 18:01:42 +02:00
committed by GitHub
parent 3cfea0e660
commit 7677ad39ca
744 changed files with 24873 additions and 13485 deletions

View File

@@ -1,48 +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="colorBackgroundPopup" format="color"/>
<attr name="colorComposeButtonBackground" format="color"/>
<attr name="colorComposeButton" format="color"/>
<attr name="colorDarkIcon" format="color"/>
<attr name="colorPollMostVoted" format="color"/>
<attr name="colorPollVoted" format="color"/>
<attr name="colorWindowBackground" format="color"/>
<attr name="composeButtonStyle" format="reference"/>
<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="profileHeaderBackground" format="color"/>
<attr name="toolbarBackground" format="color"/>
<attr name="colorIconDisabled" format="color"/>
<attr name="colorButtonBackgroundPrimaryDarkOnLight" format="color"/>
<attr name="colorButtonBackgroundPrimaryDarkOnLightDisabled" format="color"/>
<attr name="colorButtonTextPrimaryDarkOnLight" format="color"/>
<attr name="colorButtonTextPrimaryDarkOnLightDisabled" format="color"/>
<attr name="colorButtonBackgroundPrimaryLightOnDark" format="color"/>
<attr name="colorButtonBackgroundPrimaryLightOnDarkDisabled" format="color"/>
<attr name="colorButtonTextPrimaryLightOnDark" format="color"/>
<attr name="colorButtonTextPrimaryLightOnDarkDisabled" format="color"/>
<attr name="colorButtonBackgroundSecondaryDarkOnLight" format="color"/>
<attr name="colorButtonBackgroundSecondaryDarkOnLightDisabled" format="color"/>
<attr name="colorButtonTextSecondaryDarkOnLight" format="color"/>
<attr name="colorButtonTextSecondaryDarkOnLightDisabled" format="color"/>
<attr name="colorButtonBackgroundSecondaryLightOnDark" format="color"/>
<attr name="colorButtonBackgroundSecondaryLightOnDarkDisabled" format="color"/>
<attr name="colorButtonTextSecondaryLightOnDark" format="color"/>
<attr name="colorButtonTextSecondaryLightOnDarkDisabled" format="color"/>
<attr name="colorM3Primary" format="color"/>
<attr name="colorM3OnPrimary" format="color"/>
<attr name="colorM3PrimaryContainer" format="color"/>
@@ -62,26 +19,22 @@
<attr name="colorM3SurfaceVariant" format="color"/>
<attr name="colorM3OnSurfaceVariant" format="color"/>
<attr name="colorM3Outline" format="color"/>
<attr name="colorM3OutlineVariant" format="color"/>
<attr name="colorM3DisabledBackground" format="color"/>
<attr name="colorM3PressedOverlay" format="color"/>
<attr name="colorM3Error" format="color"/>
<attr name="colorM3OnError" format="color"/>
<attr name="colorM3ErrorContainer" format="color"/>
<attr name="colorM3OnErrorContainer" format="color"/>
<attr name="primaryLargeButtonStyle" format="reference"/>
<attr name="secondaryLargeButtonStyle" format="reference"/>
<declare-styleable name="MaxWidthFrameLayout">
<attr name="android:maxWidth" format="dimension"/>
<attr name="defaultWidth" format="dimension" />
</declare-styleable>
<declare-styleable name="FloatingHintEditTextLayout">
<attr name="editTextOffsetY" format="dimension"/>
<attr name="android:labelTextSize" format="dimension"/>
<attr name="labelTextColor" format="color"/>
</declare-styleable>
<attr name="colorM3PrimaryInverse" format="color"/>
<attr name="colorSensitiveOverlay" format="color"/>
<attr name="colorWhite" format="color"/>
<attr name="colorFavorite" format="color" />
<attr name="colorBoost" format="color" />
<attr name="colorPoll" format="color" />
<attr name="colorProfileHeaderBackground" format="color"/>
<attr name="colorM3DarkOnSurface" format="color" />
<attr name="colorTabBarAlpha" format="color" />
<attr name="colorPrimary25" format="color" />
<attr name="colorPrimary50" format="color" />
@@ -106,7 +59,6 @@
<attr name="colorGray600" format="color" />
<attr name="colorGray700" format="color" />
<attr name="colorGray800" format="color" />
<attr name="colorGray800t" format="color" />
<attr name="colorGray900" format="color" />
<attr name="colorSecondary25" format="color" />
@@ -144,6 +96,20 @@
<attr name="colorNeutral600" format="color" />
<attr name="colorNeutral700" format="color" />
<attr name="colorNeutral800" format="color" />
<attr name="colorNeutral800t" format="color" />
<attr name="colorNeutral900" format="color" />
<declare-styleable name="MaxWidthFrameLayout">
<attr name="android:maxWidth" format="dimension"/>
<attr name="defaultWidth" format="dimension" />
</declare-styleable>
<declare-styleable name="FloatingHintEditTextLayout">
<attr name="editTextOffsetY" format="dimension"/>
<attr name="android:labelTextSize" format="dimension"/>
<attr name="labelTextColor" format="color"/>
</declare-styleable>
<declare-styleable name="NestedRecyclerScrollView">
<attr name="takePriorityOverChildViews" format="boolean"/>
</declare-styleable>
</resources>

View File

@@ -7,7 +7,6 @@
<color name="gray_900">#18131c</color>
<color name="gray_800">#1E1824</color>
<color name="gray_800t">#CC1E1824</color>
<color name="gray_700">#2c2631</color>
<color name="gray_600">#403b45</color>
<color name="gray_500">#5b565f</color>
@@ -90,12 +89,11 @@
<color name="fab_icon">#282C37</color>
<color name="navigation_bar_bg">#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="bookmark_selected">@color/success_500</color>
<color name="boost_selected">@color/primary_500</color>
<color name="shortcut_icon_background">@color/gray_100</color>
<color name="shortcut_icon_foreground">@color/primary_700</color>
@@ -104,7 +102,6 @@
<color name="m3_navigation_bar_bg">@color/gray_50</color>
<color name="m3_neutral1_900">@color/gray_900</color>
<color name="m3_neutral1_800t">@color/gray_800t</color>
<color name="m3_neutral1_800">@color/gray_800</color>
<color name="m3_neutral1_700">@color/gray_700</color>
<color name="m3_neutral1_600">@color/gray_600</color>
@@ -118,7 +115,6 @@
<color name="m3_neutral1_25">@color/gray_25</color>
<color name="m3_neutral2_900">@color/gray_900</color>
<color name="m3_neutral2_800t">@color/gray_800t</color>
<color name="m3_neutral2_800">@color/gray_800</color>
<color name="m3_neutral2_700">@color/gray_700</color>
<color name="m3_neutral2_600">@color/gray_600</color>
@@ -187,6 +183,7 @@
<color name="m3_sys_light_surface_variant">#E7E0EC</color>
<color name="m3_sys_light_on_surface_variant">#49454F</color>
<color name="m3_sys_light_outline">#79747E</color>
<color name="m3_sys_light_outline_variant">#CAC4D0</color>
<!-- dark theme -->
<color name="m3_sys_dark_primary">#D0BCFF</color>
@@ -208,6 +205,10 @@
<color name="m3_sys_dark_surface_variant">#49454F</color>
<color name="m3_sys_dark_on_surface_variant">#CAC4D0</color>
<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>
<!-- PALETTE COLORS -->
@@ -237,7 +238,6 @@
<color name="brownish_gray_900">#110c10</color>
<color name="brownish_gray_800">#191417</color>
<color name="brownish_gray_800t">#cc191417</color>
<color name="brownish_gray_700">#231f22</color>
<color name="brownish_gray_600">#3b373a</color>
<color name="brownish_gray_500">#625d60</color>

View File

@@ -6,6 +6,8 @@
<item name="profile_posts_with_replies" type="id"/>
<item name="profile_pinned_posts" type="id"/>
<item name="profile_media" type="id"/>
<item name="profile_featured" type="id"/>
<item name="profile_timeline" type="id"/>
<item name="profile_about" type="id"/>
<item name="discover_posts" type="id"/>
@@ -19,6 +21,18 @@
<item name="notifications_all" type="id"/>
<item name="notifications_mentions" type="id"/>
<item name="save" type="id"/>
<item name="menu_add_timeline" type="id" />
<item name="menu_back" type="id" />
<item name="list_item_simple" type="id"/>
<item name="list_item_simple_tinted" type="id"/>
<item name="list_item_switch" type="id"/>
<item name="list_item_checkbox" type="id"/>
<item name="list_item_radio" type="id"/>
<item name="list_item_account" type="id"/>
<item name="server_about" type="id"/>
<item name="server_rules" type="id"/>
</resources>

View 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>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="ColorPalette">
<style name="ColorPalette.Fallback" parent="">
<item name="colorPrimary25">@color/primary_25</item>
<item name="colorPrimary50">@color/primary_50</item>
<item name="colorPrimary100">@color/primary_100</item>
@@ -14,7 +14,6 @@
<item name="colorPrimary900">@color/primary_900</item>
<item name="colorGray900">@color/gray_900</item>
<item name="colorGray800t">@color/gray_800t</item>
<item name="colorGray800">@color/gray_800</item>
<item name="colorGray700">@color/gray_700</item>
<item name="colorGray600">@color/gray_600</item>
@@ -26,52 +25,159 @@
<item name="colorGray50t">@color/gray_50t</item>
<item name="colorGray50">@color/gray_50</item>
<item name="colorGray25">@color/gray_25</item>
</style>
<style name="ColorPalette">
<item name="colorM3Primary">?colorPrimary600</item>
<item name="colorM3OnPrimary">@color/white</item>
<item name="colorM3PrimaryContainer">?colorPrimary100</item>
<item name="colorM3OnPrimaryContainer">?colorPrimary900</item>
<item name="colorM3Secondary">?colorSecondary600</item>
<item name="colorM3OnSecondary">@color/white</item>
<item name="colorM3SecondaryContainer">?colorSecondary100</item>
<item name="colorM3OnSecondaryContainer">?colorSecondary900</item>
<item name="colorM3Tertiary">?colorTertiary600</item>
<item name="colorM3OnTertiary">@color/white</item>
<item name="colorM3TertiaryContainer">?colorTertiary100</item>
<item name="colorM3OnTertiaryContainer">?colorTertiary900</item>
<item name="colorM3Background">?colorGray25</item>
<item name="colorM3OnBackground">?colorGray900</item>
<item name="colorM3Surface">?colorGray25</item>
<item name="colorM3OnSurface">?colorGray900</item>
<item name="colorM3SurfaceVariant">?colorNeutral100</item>
<item name="colorM3OnSurfaceVariant">?colorNeutral700</item>
<item name="colorM3Outline">?colorNeutral500</item>
<item name="colorM3OutlineVariant">?colorNeutral200</item>
<item name="colorM3PressedOverlay">@color/white</item>
<item name="colorM3DarkOnSurface">?colorGray100</item>
<item name="colorM3PrimaryInverse">?colorPrimary200</item>
<item name="colorFavorite">@color/favorite_selected</item>
<item name="colorBoost">?colorM3Primary</item>
<item name="colorPoll">@color/bookmark_selected</item>
<item name="colorTabBarAlpha">#14000000</item>
<item name="colorM3DisabledBackground">#1F1F1F1F</item>
<item name="colorM3Error">#B3261E</item>
<item name="colorM3OnError">@color/white</item>
<item name="colorM3ErrorContainer">#F9DEDC</item>
<item name="colorM3OnErrorContainer">#410E0B</item>
<item name="colorWhite">#FFF</item>
<item name="colorSensitiveOverlay">#a6ffffff</item>
<!--
custom themes generally don't have secondary/tertiary accent colors -
falling back to primary colors
-->
<item name="colorSecondary25">@color/primary_25</item>
<item name="colorSecondary50">@color/primary_50</item>
<item name="colorSecondary100">@color/primary_100</item>
<item name="colorSecondary200">@color/primary_200</item>
<item name="colorSecondary300">@color/primary_300</item>
<item name="colorSecondary400">@color/primary_400</item>
<item name="colorSecondary500">@color/primary_500</item>
<item name="colorSecondary600">@color/primary_600</item>
<item name="colorSecondary700">@color/primary_700</item>
<item name="colorSecondary800">@color/primary_800</item>
<item name="colorSecondary900">@color/primary_900</item>
<item name="colorSecondary25">?colorPrimary25</item>
<item name="colorSecondary50">?colorPrimary50</item>
<item name="colorSecondary100">?colorPrimary100</item>
<item name="colorSecondary200">?colorPrimary200</item>
<item name="colorSecondary300">?colorPrimary300</item>
<item name="colorSecondary400">?colorPrimary400</item>
<item name="colorSecondary500">?colorPrimary500</item>
<item name="colorSecondary600">?colorPrimary600</item>
<item name="colorSecondary700">?colorPrimary700</item>
<item name="colorSecondary800">?colorPrimary800</item>
<item name="colorSecondary900">?colorPrimary900</item>
<item name="colorTertiary25">@color/primary_25</item>
<item name="colorTertiary50">@color/primary_50</item>
<item name="colorTertiary100">@color/primary_100</item>
<item name="colorTertiary200">@color/primary_200</item>
<item name="colorTertiary300">@color/primary_300</item>
<item name="colorTertiary400">@color/primary_400</item>
<item name="colorTertiary500">@color/primary_500</item>
<item name="colorTertiary600">@color/primary_600</item>
<item name="colorTertiary700">@color/primary_700</item>
<item name="colorTertiary800">@color/primary_800</item>
<item name="colorTertiary900">@color/primary_900</item>
<item name="colorTertiary25">?colorPrimary25</item>
<item name="colorTertiary50">?colorPrimary50</item>
<item name="colorTertiary100">?colorPrimary100</item>
<item name="colorTertiary200">?colorPrimary200</item>
<item name="colorTertiary300">?colorPrimary300</item>
<item name="colorTertiary400">?colorPrimary400</item>
<item name="colorTertiary500">?colorPrimary500</item>
<item name="colorTertiary600">?colorPrimary600</item>
<item name="colorTertiary700">?colorPrimary700</item>
<item name="colorTertiary800">?colorPrimary800</item>
<item name="colorTertiary900">?colorPrimary900</item>
<item name="colorNeutral900">@color/gray_900</item>
<item name="colorNeutral800t">@color/gray_800t</item>
<item name="colorNeutral800">@color/gray_800</item>
<item name="colorNeutral700">@color/gray_700</item>
<item name="colorNeutral600">@color/gray_600</item>
<item name="colorNeutral500">@color/gray_500</item>
<item name="colorNeutral400">@color/gray_400</item>
<item name="colorNeutral300">@color/gray_300</item>
<item name="colorNeutral200">@color/gray_200</item>
<item name="colorNeutral100">@color/gray_100</item>
<item name="colorNeutral50t">@color/gray_50t</item>
<item name="colorNeutral50">@color/gray_50</item>
<item name="colorNeutral25">@color/gray_25</item>
<item name="colorNeutral900">?colorGray900</item>
<item name="colorNeutral800">?colorGray800</item>
<item name="colorNeutral700">?colorGray700</item>
<item name="colorNeutral600">?colorGray600</item>
<item name="colorNeutral500">?colorGray500</item>
<item name="colorNeutral400">?colorGray400</item>
<item name="colorNeutral300">?colorGray300</item>
<item name="colorNeutral200">?colorGray200</item>
<item name="colorNeutral100">?colorGray100</item>
<item name="colorNeutral50t">?colorGray50t</item>
<item name="colorNeutral50">?colorGray50</item>
<item name="colorNeutral25">?colorGray25</item>
</style>
<style name="ColorPalette.Dark">
<item name="colorM3Primary">?colorPrimary200</item>
<item name="colorM3OnPrimary">?colorPrimary800</item>
<item name="colorM3PrimaryContainer">?colorPrimary700</item>
<item name="colorM3OnPrimaryContainer">?colorPrimary100</item>
<item name="colorM3Secondary">?colorSecondary200</item>
<item name="colorM3OnSecondary">?colorSecondary800</item>
<!-- TODO: replace this -->
<item name="colorM3SecondaryContainer">?colorNeutral600</item>
<item name="colorM3OnSecondaryContainer">?colorSecondary100</item>
<item name="colorM3Tertiary">?colorTertiary200</item>
<item name="colorM3OnTertiary">?colorTertiary800</item>
<item name="colorM3TertiaryContainer">?colorTertiary700</item>
<item name="colorM3OnTertiaryContainer">?colorTertiary100</item>
<item name="colorM3Background">?colorGray900</item>
<item name="colorM3OnBackground">?colorGray100</item>
<item name="colorM3Surface">?colorGray900</item>
<item name="colorM3OnSurface">?colorGray100</item>
<item name="colorM3SurfaceVariant">?colorNeutral700</item>
<item name="colorM3OnSurfaceVariant">?colorNeutral100</item>
<item name="colorM3Outline">?colorNeutral500</item>
<item name="colorM3OutlineVariant">?colorNeutral700</item>
<item name="colorM3PressedOverlay">?colorPrimary200</item>
<item name="colorM3DisabledBackground">#1FE3E3E3</item>
<item name="colorM3Error">#F2B8B5</item>
<item name="colorM3OnError">#601410</item>
<item name="colorM3ErrorContainer">#8C1D18</item>
<item name="colorM3OnErrorContainer">#F9DEDC</item>
<item name="colorWhite">#000</item>
<item name="colorSensitiveOverlay">#80000000</item>
</style>
<style name="ColorPalette.Dark.TrueBlack">
<item name="android:navigationBarColor">@color/black</item>
<item name="android:colorBackground">@color/black</item>
<item name="android:statusBarColor">@color/black</item>
<item name="android:windowBackground">@color/black</item>
<item name="colorM3Background">@color/black</item>
<item name="colorM3Surface">@color/black</item>
<item name="colorM3SurfaceVariant">?colorNeutral900</item>
<item name="colorM3SecondaryContainer">?colorNeutral800</item>
<item name="colorTabBarAlpha">#00000000</item>
</style>
<style name="ColorPalette.Material3">
<item name="colorM3Primary">@color/m3_sys_light_primary</item>
<item name="colorM3OnPrimary">@color/m3_sys_light_on_primary</item>
<item name="colorM3PrimaryContainer">@color/m3_sys_light_primary_container</item>
<item name="colorM3OnPrimaryContainer">@color/m3_sys_light_on_primary_container</item>
<item name="colorM3Secondary">@color/m3_sys_light_secondary</item>
<item name="colorM3OnSecondary">@color/m3_sys_light_on_secondary</item>
<item name="colorM3SecondaryContainer">@color/m3_sys_light_secondary_container</item>
<item name="colorM3OnSecondaryContainer">@color/m3_sys_light_on_secondary_container</item>
<item name="colorM3Tertiary">@color/m3_sys_light_tertiary</item>
<item name="colorM3OnTertiary">@color/m3_sys_light_on_tertiary</item>
<item name="colorM3TertiaryContainer">@color/m3_sys_light_tertiary_container</item>
<item name="colorM3OnTertiaryContainer">@color/m3_sys_light_on_tertiary_container</item>
<item name="colorM3Background">@color/m3_sys_light_background</item>
<item name="colorM3OnBackground">@color/m3_sys_light_on_background</item>
<item name="colorM3Surface">@color/m3_sys_light_surface</item>
<item name="colorM3OnSurface">@color/m3_sys_light_on_surface</item>
<item name="colorM3SurfaceVariant">@color/m3_sys_light_surface_variant</item>
<item name="colorM3OnSurfaceVariant">@color/m3_sys_light_on_surface_variant</item>
<item name="colorM3Outline">@color/m3_sys_light_outline</item>
<item name="colorM3OutlineVariant">@color/m3_sys_light_outline_variant</item>
<item name="colorM3PressedOverlay">@color/m3_sys_light_on_primary</item>
<item name="colorM3PrimaryInverse">@color/m3_sys_dark_primary</item>
<item name="colorM3DarkOnSurface">@color/m3_sys_dark_on_surface</item>
<item name="colorPrimary25">@color/m3_accent1_25</item>
<item name="colorPrimary50">@color/m3_accent1_50</item>
<item name="colorPrimary100">@color/m3_accent1_100</item>
@@ -109,7 +215,6 @@
<item name="colorTertiary900">@color/m3_accent3_900</item>
<item name="colorGray900">@color/m3_neutral1_900</item>
<item name="colorGray800t">@color/m3_neutral1_800t</item>
<item name="colorGray800">@color/m3_neutral1_800</item>
<item name="colorGray700">@color/m3_neutral1_700</item>
<item name="colorGray600">@color/m3_neutral1_600</item>
@@ -123,7 +228,6 @@
<item name="colorGray25">@color/m3_neutral1_25</item>
<item name="colorNeutral900">@color/m3_neutral2_900</item>
<item name="colorNeutral800t">@color/m3_neutral2_800t</item>
<item name="colorNeutral800">@color/m3_neutral2_800</item>
<item name="colorNeutral700">@color/m3_neutral2_700</item>
<item name="colorNeutral600">@color/m3_neutral2_600</item>
@@ -138,13 +242,28 @@
</style>
<style name="ColorPalette.Material3.Dark">
<item name="colorPollVoted">?colorGray700</item>
<item name="colorWindowBackground">?colorGray900</item>
<item name="colorBackgroundLight">?colorGray800</item>
<item name="colorBackgroundLightest">?colorGray900</item>
<item name="android:colorBackground">?colorGray800</item>
<item name="android:statusBarColor">?colorGray900</item>
<item name="toolbarBackground">?colorGray900</item>
<item name="colorM3Primary">@color/m3_sys_dark_primary</item>
<item name="colorM3OnPrimary">@color/m3_sys_dark_on_primary</item>
<item name="colorM3PrimaryContainer">@color/m3_sys_dark_primary_container</item>
<item name="colorM3OnPrimaryContainer">@color/m3_sys_dark_on_primary_container</item>
<item name="colorM3Secondary">@color/m3_sys_dark_secondary</item>
<item name="colorM3OnSecondary">@color/m3_sys_dark_on_secondary</item>
<item name="colorM3SecondaryContainer">@color/m3_sys_dark_secondary_container</item>
<item name="colorM3OnSecondaryContainer">@color/m3_sys_dark_on_secondary_container</item>
<item name="colorM3Tertiary">@color/m3_sys_dark_tertiary</item>
<item name="colorM3OnTertiary">@color/m3_sys_dark_on_tertiary</item>
<item name="colorM3TertiaryContainer">@color/m3_sys_dark_tertiary_container</item>
<item name="colorM3OnTertiaryContainer">@color/m3_sys_dark_on_tertiary_container</item>
<item name="colorM3Background">@color/m3_sys_dark_background</item>
<item name="colorM3OnBackground">@color/m3_sys_dark_on_background</item>
<item name="colorM3Surface">@color/m3_sys_dark_surface</item>
<item name="colorM3OnSurface">@color/m3_sys_dark_on_surface</item>
<item name="colorM3SurfaceVariant">@color/m3_sys_dark_surface_variant</item>
<item name="colorM3OnSurfaceVariant">@color/m3_sys_dark_on_surface_variant</item>
<item name="colorM3Outline">@color/m3_sys_dark_outline</item>
<item name="colorM3OutlineVariant">@color/m3_sys_dark_outline_variant</item>
<item name="colorM3PressedOverlay">@color/m3_sys_dark_primary</item>
<item name="colorM3PrimaryInverse">@color/m3_sys_light_primary</item>
</style>
<style name="ColorPalette.Pink">
@@ -189,7 +308,6 @@
<item name="colorPrimary900">@color/green_primary_900</item>
<item name="colorGray900">@color/brownish_gray_900</item>
<item name="colorGray800t">@color/brownish_gray_800t</item>
<item name="colorGray800">@color/brownish_gray_800</item>
<item name="colorGray700">@color/brownish_gray_700</item>
<item name="colorGray600">@color/brownish_gray_600</item>
@@ -240,7 +358,6 @@
<item name="colorPrimary900">@color/brown_primary_900</item>
<item name="colorGray900">@color/brownish_gray_900</item>
<item name="colorGray800t">@color/brownish_gray_800t</item>
<item name="colorGray800">@color/brownish_gray_800</item>
<item name="colorGray700">@color/brownish_gray_700</item>
<item name="colorGray600">@color/brownish_gray_600</item>
@@ -269,7 +386,6 @@
<item name="colorPrimary900">@color/yellow_primary_900</item>
<item name="colorGray900">@color/brownish_gray_900</item>
<item name="colorGray800t">@color/brownish_gray_800t</item>
<item name="colorGray800">@color/brownish_gray_800</item>
<item name="colorGray700">@color/brownish_gray_700</item>
<item name="colorGray600">@color/brownish_gray_600</item>
@@ -299,7 +415,6 @@
<item name="colorPrimary900">@color/red_primary_900</item>
<item name="colorGray900">@color/brownish_gray_900</item>
<item name="colorGray800t">@color/brownish_gray_800t</item>
<item name="colorGray800">@color/brownish_gray_800</item>
<item name="colorGray700">@color/brownish_gray_700</item>
<item name="colorGray600">@color/brownish_gray_600</item>

View File

@@ -2,13 +2,11 @@
<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>
<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 doesnt 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>
@@ -16,16 +14,11 @@
<string name="in_reply_to">In reply to %s</string>
<string name="notifications">Notifications</string>
<string name="user_followed_you">followed you</string>
<string name="user_sent_follow_request">sent you a follow request</string>
<string name="user_favorited">favorited your post</string>
<string name="notification_boosted">boosted your post</string>
<string name="poll_ended">poll ended</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="user_followed_you">%s followed you</string>
<string name="user_sent_follow_request">%s sent you a follow request</string>
<string name="user_favorited">%s favorited your post</string>
<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="share_toot_title">Share</string>
<string name="settings">Settings</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,8 +42,7 @@
<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 %s</string>
<string name="share_user">Share profile</string>
<string name="mute_user">Mute %s</string>
<string name="unmute_user">Unmute %s</string>
<string name="block_user">Block %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>
@@ -103,9 +90,9 @@
<item quantity="one">%d day left</item>
<item quantity="other">%d days left</item>
</plurals>
<plurals name="x_voters">
<item quantity="one">%,d voter</item>
<item quantity="other">%,d voters</item>
<plurals name="x_votes">
<item quantity="one">%,d vote</item>
<item quantity="other">%,d votes</item>
</plurals>
<string name="poll_closed">Closed</string>
<string name="confirm_mute_title">Mute Account</string>
@@ -122,44 +109,38 @@
<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_title">Delete post</string>
<string name="confirm_delete">Are you sure you want to delete this post?</string>
<string name="deleting">Deleting…</string>
<string name="notification_channel_audio_player">Audio playback</string>
<string name="play">Play</string>
<string name="pause">Pause</string>
<string name="log_out">Sign out</string>
<string name="log_out">Log out</string>
<string name="add_account">Add account</string>
<string name="search_hint">Search</string>
<string name="hashtags">Hashtags</string>
<string name="news">News</string>
<string name="for_you">For you</string>
<string name="all_notifications">All</string>
<string name="all_notifications">Everything</string>
<string name="mentions">Mentions</string>
<plurals name="x_people_talking">
<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>
<string name="report_choose_reason">Whats wrong with this post?</string>
<string name="report_choose_reason_account">Whats 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 dont 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">Its 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">Its 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,22 +149,19 @@
<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, well 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">Dont 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>
@@ -205,27 +183,19 @@
<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. Well wait right here.</string>
<string name="confirm_email_didnt_get">Didnt 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 whats 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 I mention</string>
<string name="search_all">All</string>
<string name="search_people">People</string>
<string name="recent_searches">Recent searches</string>
<string name="step_x_of_n">Step %1$d of %2$d</string>
<string name="visibility_private">Only people mentioned</string>
<string name="recent_searches">Recents</string>
<string name="skip">Skip</string>
<string name="notification_type_follow">New followers</string>
<string name="notification_type_favorite">Favorites</string>
@@ -235,46 +205,29 @@
<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 cant add more than %d media attachment</item>
<item quantity="other">You cant 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>
<string name="settings_theme">Visual appearance</string>
<string name="theme_auto">Automatic</string>
<string name="settings_theme">Appearance</string>
<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>
<string name="confirm_log_out">Are you sure you want to sign out?</string>
<string name="sensitive_content">Sensitive content</string>
<string name="sensitive_content_explain">The author marked this media as sensitive. Tap to reveal.</string>
<string name="media_hidden">Tap to reveal</string>
<string name="avatar_description">Go to %s\'s profile</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="avatar_description">Go to %ss 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>
@@ -284,13 +237,12 @@
<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>
<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">Youre 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>
@@ -308,21 +260,19 @@
<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="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>
<string name="trending_links_info_banner">These are the news stories being shared the most in your corner of Mastodon.</string>
<string name="local_timeline_info_banner">These are the most recent posts by the people who use the same Mastodon server as you.</string>
<string name="dismiss">Dismiss</string>
<string name="no_app_to_handle_action">Theres no app to handle this action</string>
<string name="local_timeline">Local</string>
<string name="trending_posts_info_banner">These are the posts gaining traction across Mastodon.</string>
<string name="trending_links_info_banner">These are the news stories getting talked about on Mastodon.</string>
<!-- %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="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">
@@ -343,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>
@@ -378,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>
@@ -402,7 +345,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">Well 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>
@@ -415,7 +358,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 dont 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>
@@ -424,15 +367,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 dont 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 &lt;a>pick a different server&lt;/a>.</string>
<string name="signup_username_taken">This username is taken.</string>
<string name="signup_email_domain_blocked">%1$s doesnt allow signups from %2$s. Try a different one or &lt;a>pick a different server&lt;/a>.</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>
@@ -452,6 +394,199 @@
<string name="welcome_paragraph1">Mastodon is a decentralized social network, meaning no single company controls it. Its made up of many independently-run servers, all connected together.</string>
<string name="what_are_servers">What are servers?</string>
<string name="welcome_paragraph2"><![CDATA[Every Mastodon account is hosted on a server — each with its own values, rules, & admins. No matter which one you pick, you can follow and interact with people on any server.]]></string>
<string name="opening_link">Opening link…</string>
<string name="link_not_supported">This link is not supported in the app</string>
<string name="log_out_all_accounts">Log out of all accounts</string>
<string name="confirm_log_out_all_accounts">Log out of all accounts?</string>
</resources>
<string name="retry">Retry</string>
<string name="post_failed">Failed to send post</string>
<!-- %s is formatted file size ("467 KB image") -->
<string name="attachment_description_image">%s image</string>
<string name="attachment_description_video">%s video</string>
<string name="attachment_description_audio">%s audio</string>
<string name="attachment_description_unknown">%s file</string>
<string name="attachment_type_image">Image</string>
<string name="attachment_type_video">Video</string>
<string name="attachment_type_audio">Audio</string>
<string name="attachment_type_gif">GIF</string>
<string name="attachment_type_unknown">File</string>
<string name="attachment_x_percent_uploaded">%d%% uploaded</string>
<string name="add_poll_option">Add poll option</string>
<string name="poll_length">Poll length</string>
<string name="poll_style">Style</string>
<string name="compose_poll_single_choice">Pick one</string>
<string name="compose_poll_multiple_choice">Multiple choice</string>
<string name="delete_poll_option">Delete poll option</string>
<string name="poll_style_title">Poll style</string>
<string name="alt_text">Alt text</string>
<string name="help">Help</string>
<string name="what_is_alt_text">What is alt text?</string>
<string name="alt_text_help">Alt text provides image descriptions for people with vision impairments, low-bandwidth connections, or those seeking extra context.\n\nYou can improve accessibility and understanding for everyone by writing clear, concise, and objective alt text.\n\n<ul><li>Capture important elements</li>\n<li>Summarize text in images</li>\n<li>Use regular sentence structure</li>\n<li>Avoid redundant information</li>\n<li>Focus on trends and key findings in complex visuals (like diagrams or maps)</li></ul></string>
<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 youre 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>
<string name="language_system">System</string>
<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">Youve already blocked this user, so theres nothing else you need to do while we review your report.</string>
<string name="report_personal_already_blocked">Youve already blocked this user, so theres 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>
<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_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>
<string name="default_post_language">Default post language</string>
<string name="settings_alt_text_reminders">Add alt text reminders</string>
<string name="settings_confirm_unfollow">Ask before unfollowing someone</string>
<string name="settings_confirm_boost">Ask before boosting</string>
<string name="settings_confirm_delete_post">Ask before deleting posts</string>
<string name="pause_all_notifications">Pause all</string>
<string name="pause_notifications_off">Off</string>
<string name="notifications_policy_anyone">Anyone</string>
<string name="notifications_policy_followed">People who follow you</string>
<string name="notifications_policy_follower">People you follow</string>
<string name="notifications_policy_no_one">No one</string>
<string name="settings_notifications_policy">Get notifications from</string>
<string name="notification_type_mentions_and_replies">Mentions and replies</string>
<string name="pause_all_notifications_title">Pause all notifications</string>
<plurals name="x_weeks">
<item quantity="one">%d week</item>
<item quantity="other">%d weeks</item>
</plurals>
<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
<string name="date_at_time">%1$s at %2$s</string>
<string name="today">today</string>
<string name="yesterday">yesterday</string>
<string name="tomorrow">tomorrow</string>
<!-- %s is the timestamp ("tomorrow at 12:34") -->
<string name="pause_notifications_ends">Ends %s</string>
<!-- %s is the timestamp ("tomorrow at 12:34") -->
<string name="pause_notifications_banner">Notifications will resume %s.</string>
<string name="resume_notifications_now">Resume now</string>
<string name="open_system_notification_settings">Go to notification settings</string>
<string name="about_server">About</string>
<string name="server_rules">Rules</string>
<string name="server_administrator">Administrator</string>
<string name="send_email_to_server_admin">Message admin</string>
<string name="notifications_disabled_in_system">Turn on notifications from your device settings to see updates from anywhere.</string>
<string name="settings_even_more">Even more settings</string>
<string name="settings_show_cws">Show content warnings</string>
<string name="settings_hide_sensitive_media">Cover up media marked as sensitive</string>
<string name="settings_show_interaction_counts">Post interaction counts</string>
<string name="settings_show_emoji_in_names">Custom emoji in display names</string>
<plurals name="in_x_seconds">
<item quantity="one">in %d second</item>
<item quantity="other">in %d seconds</item>
</plurals>
<plurals name="in_x_minutes">
<item quantity="one">in %d minute</item>
<item quantity="other">in %d minutes</item>
</plurals>
<plurals name="in_x_hours">
<item quantity="one">in %d hour</item>
<item quantity="other">in %d hours</item>
</plurals>
<plurals name="x_hours_ago">
<item quantity="one">%d hour ago</item>
<item quantity="other">%d hours ago</item>
</plurals>
<string name="alt_text_reminder_title">Media missing alt text</string>
<plurals name="alt_text_reminder_x_images">
<item quantity="one">%s of your images is missing alt text. Post anyway?</item>
<item quantity="other">%s of your images are missing alt text. Post anyway?</item>
</plurals>
<plurals name="alt_text_reminder_x_attachments">
<item quantity="one">%s of your media attachments is missing alt text. Post anyway?</item>
<item quantity="other">%s of your media attachments are missing alt text. Post anyway?</item>
</plurals>
<string name="count_one">One</string>
<string name="count_two">Two</string>
<string name="count_three">Three</string>
<string name="count_four">Four</string>
<string name="alt_text_reminder_post_anyway">Post</string>
<!-- %s is the username -->
<string name="unfollow_confirmation">Unfollow %s?</string>
<string name="filter_active">Active</string>
<string name="filter_inactive">Inactive</string>
<string name="settings_add_filter">Add filter</string>
<string name="settings_edit_filter">Edit filter</string>
<string name="settings_filter_duration">Duration</string>
<string name="settings_filter_muted_words">Muted words</string>
<string name="settings_filter_context">Mute from</string>
<string name="settings_filter_show_cw">Show with content warning</string>
<string name="settings_filter_show_cw_explanation">Still show posts that match this filter, but behind a content warning</string>
<string name="settings_delete_filter">Delete filter</string>
<string name="filter_duration_forever">Forever</string>
<!-- %s is the timestamp ("tomorrow at 12:34") -->
<string name="settings_filter_ends">Ends %s</string>
<plurals name="settings_x_muted_words">
<item quantity="one">%d muted word or phrase</item>
<item quantity="other">%d muted words or phrases</item>
</plurals>
<string name="selection_2_options">%1$s and %2$s</string>
<string name="selection_3_options">%1$s, %2$s, and %3$s</string>
<string name="selection_4_or_more">%1$s, %2$s, and %3$d more</string>
<string name="filter_context_home_lists">Home &amp; lists</string>
<string name="filter_context_notifications">Notifications</string>
<string name="filter_context_public_timelines">Public timelines</string>
<string name="filter_context_threads_replies">Threads &amp; replies</string>
<string name="filter_context_profiles">Profiles</string>
<string name="settings_filter_title">Title</string>
<string name="settings_delete_filter_title">Delete filter “%s”?</string>
<string name="settings_delete_filter_confirmation">This filter will be deleted from your account on all your devices.</string>
<string name="add_muted_word">Add muted word</string>
<string name="edit_muted_word">Edit muted word</string>
<string name="add">Add</string>
<string name="filter_word_or_phrase">Word or phrase</string>
<string name="filter_add_word_help">Words are case-insensitive and match full words only.\n\nIf you filter the keyword “Apple,” it will hide posts containing “apple” or “aPpLe” but not “pineapple.”</string>
<string name="settings_delete_filter_word">Delete word “%s”?</string>
<string name="enter_selection_mode">Select</string>
<string name="select_all">Select all</string>
<string name="settings_filter_duration_title">Filter duration</string>
<string name="filter_duration_custom">Custom</string>
<plurals name="settings_delete_x_filter_words">
<item quantity="one">Delete %d word?</item>
<item quantity="other">Delete %d words?</item>
</plurals>
<plurals name="x_items_selected">
<item quantity="one">%d selected</item>
<item quantity="other">%d selected</item>
</plurals>
<string name="required_form_field_blank">Cannot be blank</string>
<string name="filter_word_already_in_list">Already in the list</string>
<string name="app_update_ready">App update ready</string>
<string name="app_update_version">Version %s</string>
<string name="downloading_update">Downloading (%d%%)</string>
<!-- Shown like a content warning, %s is the name of the filter -->
<string name="post_matches_filter_x">Matches filter “%s”</string>
<string name="search_mastodon">Search Mastodon</string>
<string name="clear_all">Clear all</string>
<string name="search_open_url">Open URL in Mastodon</string>
<string name="posts_matching_hashtag">Posts with “%s”</string>
<string name="search_go_to_account">Go to %s</string>
<string name="posts_matching_string">Posts with “%s”</string>
<string name="accounts_matching_string">People with “%s”</string>
<!-- Shown in the post header. Please keep it short -->
<string name="time_seconds_ago_short">%ds ago</string>
<string name="time_minutes_ago_short">%dm ago</string>
<string name="time_hours_ago_short">%dh ago</string>
<string name="time_days_ago_short">%dd ago</string>
</resources>

View File

@@ -41,11 +41,11 @@
<string name="sk_reject_follow_request">Reject follow request</string>
<string name="sk_lists_with_user">Lists with %s</string>
<string name="sk_settings_always_reveal_content_warnings">Always reveal content warnings</string>
<string name="sk_disable_marquee">Disable scrolling text in title bars</string>
<string name="sk_settings_enable_marquee">Enable scrolling text in title bars</string>
<string name="sk_settings_contribute">Contribute to Megalodon</string>
<string name="sk_settings_show_federated_timeline">Show federated timeline</string>
<string name="sk_notification_type_status">Posts</string>
<string name="sk_notify_posts">Post notifications</string>
<string name="sk_notification_type_posts">Post notifications</string>
<string name="sk_settings_color_palette">Color palette</string>
<string name="sk_color_palette_material3">System</string>
<string name="sk_color_palette_pink">Pink</string>
@@ -68,7 +68,7 @@
<string name="sk_welcome_text">The shark salutes you! To get started, please enter your home instances domain name below.</string>
<string name="sk_example_domain">example.social</string>
<string name="sk_app_username" translatable="false">\@megalodon</string>
<string name="sk_tabs_disable_swipe">Disable swiping between tabs</string>
<string name="sk_settings_tabs_disable_swipe">Disable swiping between tabs</string>
<string name="sk_settings_profile">Set up profile</string>
<string name="sk_settings_posting">Posting preferences</string>
<string name="sk_settings_filters">Configure filters</string>
@@ -82,7 +82,7 @@
<string name="sk_clear_all_notifications">Clear all notifications</string>
<string name="sk_clear_all_notifications_confirm_action">Delete all</string>
<string name="sk_clear_all_notifications_confirm">Are you sure you want to clear all notifications\?</string>
<string name="sk_enable_delete_notifications">Enable deleting notifications</string>
<string name="sk_settings_enable_delete_notifications">Enable deleting notifications</string>
<string name="sk_settings_publish_button_text">Publish button text</string>
<string name="sk_settings_publish_button_text_title">Customize Publish button text</string>
<string name="sk_settings_translate_only_opened">Only translate opened posts</string>
@@ -248,6 +248,7 @@
<string name="sk_hashtag_timeline_local_only_switch">Show only local posts?</string>
<string name="sk_add_timeline_tag_error_empty">Hashtag must not be empty</string>
<string name="sk_alt_button">ALT</string>
<string name="sk_gif_badge">GIF</string>
<string name="sk_post_edited">edited</string>
<string name="sk_notification_type_update">Edited posts</string>
<string name="sk_notify_update">Edits a boosted post</string>
@@ -272,13 +273,13 @@
<string name="sk_settings_glitch_mode_explanation">Enable this if your home instance runs on Glitch. Not needed for Hometown or Akkoma.</string>
<string name="sk_signed_up">signed up</string>
<string name="sk_reported">reported</string>
<string name="sk_reacted_with">reacted with %s</string>
<string name="sk_reacted">reacted</string>
<string name="sk_reacted_with">%1$s reacted with %2$s</string>
<string name="sk_reacted">%s reacted</string>
<string name="sk_sign_ups">Users signing up</string>
<string name="sk_new_reports">New reports</string>
<string name="sk_settings_server_version">Server version: %s</string>
<string name="sk_notify_poll_results">Poll results</string>
<string name="sk_settings_prefix_reply_cw_with_re">Prefix CW with “re:” on replies to</string>
<string name="sk_settings_prefix_reply_cw_with_re">Prefix CW with “re:” when replying</string>
<string name="sk_filtered">Filtered: %s</string>
<string name="sk_expand">Expand</string>
<string name="sk_collapse">Collapse</string>
@@ -315,17 +316,23 @@
<string name="sk_error_loading_profile">Failed loading the profile via %s</string>
<string name="sk_settings_allow_remote_loading">Load info from remote instances</string>
<string name="sk_settings_allow_remote_loading_explanation">Try fetching more accurate listings for followers, likes and boosts by loading the information from the instance of origin.</string>
<string name="sk_settings_auto_reveal_equal_spoilers">Reveal same CWs in replies from</string>
<string name="sk_settings_auto_reveal_nobody">nobody</string>
<string name="sk_settings_auto_reveal_author">author</string>
<string name="sk_settings_auto_reveal_anyone">everyone</string>
<string name="sk_settings_prefix_replies_always">everyone</string>
<string name="sk_settings_prefix_replies_never">nobody</string>
<string name="sk_settings_prefix_replies_to_others">others</string>
<string name="sk_settings_auto_reveal_equal_spoilers">Auto-reveal equal CWs in replies</string>
<string name="sk_settings_auto_reveal_nobody">Never</string>
<string name="sk_settings_auto_reveal_author">Replies by the same author</string>
<string name="sk_settings_auto_reveal_anyone">Replies by everyone</string>
<string name="sk_settings_prefix_replies_always">In reply to anyone</string>
<string name="sk_settings_prefix_replies_never">Never</string>
<string name="sk_settings_prefix_replies_to_others">Only in reply to others</string>
<string name="sk_settings_forward_report_default">“Forward report” switch default</string>
<string name="sk_exclusive_list">Exclusive list</string>
<string name="sk_list_exclusive_switch">Make list exclusive</string>
<string name="sk_list_exclusive_switch_explanation">Members of an exclusive list will not show up on your home timeline if your instance supports it.</string>
<string name="sk_advanced_options_show">Show advanced options</string>
<string name="sk_advanced_options_hide">Hide advanced options</string>
<string name="sk_spoiler_show">Show content</string>
<string name="sk_pronouns_label">Pronouns</string>
<string name="sk_switch_timeline">Switch timeline</string>
<string name="sk_settings_instance">Instance</string>
<string name="sk_disable_pill_shaped_active_indicator">Disable pill-shaped active tab indicator</string>
<string name="sk_settings_true_black">Pitch black mode</string>
</resources>

View File

@@ -2,212 +2,90 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="TransparentDialog" parent="android:Theme.Dialog">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:backgroundDimEnabled">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:backgroundDimEnabled">false</item>
</style>
<style name="Theme.Mastodon.Light" parent="Theme.AppKit.Light">
<!-- needed to disable scrim on API 29+ -->
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
<item name="android:enforceStatusBarContrast" tools:ignore="NewApi">false</item>
<item name="appkitBackDrawable">@drawable/ic_fluent_arrow_left_24_regular</item>
<item name="android:splitMotionEvents">false</item>
<item name="android:windowBackground">?colorWindowBackground</item>
<item name="android:editTextStyle">@style/Widget.Mastodon.EditText</item>
<item name="android:windowBackground">?colorM3Surface</item>
<item name="android:editTextStyle">@style/Widget.Mastodon.M3.EditText</item>
<item name="android:editTextBackground">@drawable/bg_m3_outlined_text_field</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:colorAccent">?colorPrimary700</item>
<item name="android:colorPrimary">?colorGray800</item>
<item name="android:colorBackground">?colorGray100</item>
<item name="android:textColorPrimary">?colorGray800</item>
<item name="android:textColorSecondary">?colorGray500</item>
<item name="colorIconDisabled">?colorGray300</item>
<item name="colorButtonText">?colorGray50</item>
<item name="colorSecondary">#E9EDF2</item>
<item name="colorBackgroundLight">?colorGray50</item>
<item name="colorBackgroundLightest">?colorGray25</item>
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
<item name="colorDarkIcon">?colorGray900</item>
<item name="colorWindowBackground">@color/white</item>
<item name="android:statusBarColor">?colorGray50</item>
<item name="android:navigationBarColor">?android:statusBarColor</item>
<item name="android:colorPrimary">?colorM3OnSurface</item>
<item name="android:colorBackground">?colorM3SurfaceVariant</item>
<item name="android:buttonStyle">@style/Widget.Mastodon.M3.Button.Filled</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert</item>
<item name="android:datePickerDialogTheme">@style/Theme.Mastodon.Dialog.Alert</item>
<item name="android:timePickerDialogTheme">@style/Theme.Mastodon.Dialog.Alert</item>
<item name="colorPollMostVoted">?colorPrimary500</item>
<item name="colorPollVoted">?colorGray300</item>
<item name="colorAccentLight">?colorPrimary600</item>
<item name="colorSearchField">?colorGray200</item>
<item name="colorSearchHint">?colorGray600</item>
<item name="colorTabInactive">?colorGray400</item>
<item name="colorAccentLightest">?colorPrimary100</item>
<item name="profileHeaderBackground">?colorGray500</item>
<item name="toolbarBackground">?colorGray50</item>
<item name="colorComposeButtonBackground">?colorGray50</item>
<item name="colorComposeButton">?android:textColorPrimary</item>
<item name="composeButtonStyle">@style/Widget.Mastodon.Button.Compose</item>
<item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item>
<item name="android:editTextBackground">@drawable/bg_edittext_light</item>
<item name="colorProfileHeaderBackground">?colorM3DisabledBackground</item>
<item name="android:windowLightStatusBar">true</item>
<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>
<!-- M3 colors -->
<item name="colorM3Primary">?colorPrimary600</item>
<item name="colorM3OnPrimary">@color/white</item>
<item name="colorM3PrimaryContainer">?colorPrimary100</item>
<item name="colorM3OnPrimaryContainer">?colorPrimary900</item>
<item name="colorM3Secondary">?colorSecondary600</item>
<item name="colorM3OnSecondary">@color/white</item>
<item name="colorM3SecondaryContainer">?colorSecondary100</item>
<item name="colorM3OnSecondaryContainer">?colorSecondary900</item>
<item name="colorM3Tertiary">?colorTertiary600</item>
<item name="colorM3OnTertiary">@color/white</item>
<item name="colorM3TertiaryContainer">?colorTertiary100</item>
<item name="colorM3OnTertiaryContainer">?colorTertiary900</item>
<item name="colorM3Background">?colorGray25</item>
<item name="colorM3OnBackground">?colorGray900</item>
<item name="colorM3Surface">?colorGray25</item>
<item name="colorM3OnSurface">?colorGray900</item>
<item name="colorM3SurfaceVariant">?colorNeutral100</item>
<item name="colorM3OnSurfaceVariant">?colorNeutral700</item>
<item name="colorM3Outline">?colorNeutral500</item>
<item name="colorM3DisabledBackground">#1F1F1F1F</item>
<item name="colorM3PressedOverlay">@color/white</item>
<item name="colorM3Error">#B3261E</item>
<item name="colorM3OnError">@color/white</item>
<item name="colorM3ErrorContainer">#F9DEDC</item>
<item name="colorM3OnErrorContainer">#410E0B</item>
<item name="android:switchStyle">@style/Widget.Mastodon.M3.Switch</item>
<item name="android:windowActionModeOverlay">true</item>
<item name="android:actionModeBackground">?colorM3PrimaryContainer</item>
<item name="android:actionModeCloseDrawable">@drawable/ic_fluent_dismiss_24_regular</item>
<!-- colors for button_bg|text_primary|secondary_dark|light_on_light|dark.xml -->
<item name="colorButtonBackgroundPrimaryDarkOnLight">?colorGray800</item>
<item name="colorButtonBackgroundPrimaryDarkOnLightDisabled">?colorGray300</item>
<item name="colorButtonTextPrimaryDarkOnLight">?colorGray50</item>
<item name="colorButtonTextPrimaryDarkOnLightDisabled">?colorGray400</item>
<item name="colorButtonBackgroundPrimaryLightOnDark">?colorGray100</item>
<item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">?colorGray500</item>
<item name="colorButtonTextPrimaryLightOnDark">?colorGray800</item>
<item name="colorButtonTextPrimaryLightOnDarkDisabled">?colorGray400</item>
<item name="colorButtonBackgroundSecondaryDarkOnLight">?colorGray25</item>
<item name="colorButtonBackgroundSecondaryDarkOnLightDisabled">?colorGray100</item>
<item name="colorButtonTextSecondaryDarkOnLight">?colorGray800</item>
<item name="colorButtonTextSecondaryDarkOnLightDisabled">?colorGray400</item>
<item name="colorButtonBackgroundSecondaryLightOnDark">?colorGray600</item>
<item name="colorButtonBackgroundSecondaryLightOnDarkDisabled">?colorGray300</item>
<item name="colorButtonTextSecondaryLightOnDark">?colorGray50</item>
<item name="colorButtonTextSecondaryLightOnDarkDisabled">?colorGray400</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="android:textColor">?colorM3OnSurface</item>
<item name="android:textColorPrimary">?colorM3OnSurface</item>
<item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item>
</style>
<style name="Theme.Mastodon.Dark" parent="Theme.AppKit">
<!-- needed to disable scrim on API 29+ -->
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
<item name="android:enforceStatusBarContrast" tools:ignore="NewApi">false</item>
<item name="appkitBackDrawable">@drawable/ic_fluent_arrow_left_24_regular</item>
<item name="android:splitMotionEvents">false</item>
<item name="android:windowBackground">?colorWindowBackground</item>
<item name="android:editTextStyle">@style/Widget.Mastodon.EditText</item>
<item name="android:windowBackground">?colorM3Surface</item>
<item name="android:editTextStyle">@style/Widget.Mastodon.M3.EditText</item>
<item name="android:editTextBackground">@drawable/bg_m3_outlined_text_field</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:colorAccent">?colorPrimary400</item>
<item name="android:colorPrimary">?colorGray50</item>
<item name="android:colorBackground">?colorGray700</item>
<item name="android:textColorPrimary">?colorGray50</item>
<item name="android:textColorSecondary">?colorGray400</item>
<item name="colorIconDisabled">?colorGray500</item>
<item name="colorButtonText">?colorGray800</item>
<item name="colorSecondary">#E9EDF2</item>
<item name="colorBackgroundLight">?colorGray700</item>
<item name="colorBackgroundLightest">?colorGray900</item>
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
<item name="colorDarkIcon">?colorGray25</item>
<item name="colorWindowBackground">?colorGray800</item>
<item name="android:statusBarColor">?colorGray800</item>
<item name="android:navigationBarColor">?android:statusBarColor</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark</item>
<item name="android:colorPrimary">?colorM3OnSurface</item>
<item name="android:colorBackground">?colorM3SurfaceVariant</item>
<item name="android:buttonStyle">@style/Widget.Mastodon.M3.Button.Filled</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark</item>
<item name="android:datePickerDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark</item>
<item name="android:timePickerDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark</item>
<item name="colorPollMostVoted">?colorPrimary700</item>
<item name="colorPollVoted">?colorGray600</item>
<item name="colorAccentLight">?colorPrimary600</item>
<item name="colorAccentLightest">?colorPrimary800</item>
<item name="colorTabInactive">?colorGray400</item>
<item name="profileHeaderBackground">?colorWindowBackground</item>
<item name="colorSearchField">?colorGray700</item>
<item name="colorSearchHint">?colorGray300</item>
<item name="toolbarBackground">?colorGray800</item>
<item name="colorComposeButton">?colorPrimary700</item>
<item name="colorComposeButtonBackground">?colorGray100</item>
<item name="composeButtonStyle">@style/Widget.Mastodon.Button.Compose</item>
<item name="buttonBackground">@drawable/bg_button_primary_light_on_dark</item>
<item name="android:editTextBackground">@drawable/bg_edittext_dark</item>
<item name="colorProfileHeaderBackground">?colorM3Background</item>
<item name="android:windowLightStatusBar">false</item>
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</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>
<item name="android:windowActionModeOverlay">true</item>
<item name="android:actionModeBackground">?colorM3PrimaryContainer</item>
<item name="android:actionModeCloseDrawable">@drawable/ic_fluent_dismiss_24_regular</item>
<!-- M3 colors -->
<item name="colorM3Primary">?colorPrimary200</item>
<item name="colorM3OnPrimary">?colorPrimary800</item>
<item name="colorM3PrimaryContainer">?colorPrimary700</item>
<item name="colorM3OnPrimaryContainer">?colorPrimary100</item>
<item name="colorM3Secondary">?colorSecondary200</item>
<item name="colorM3OnSecondary">?colorSecondary800</item>
<item name="colorM3SecondaryContainer">?colorSecondary700</item>
<item name="colorM3OnSecondaryContainer">?colorSecondary100</item>
<item name="colorM3Tertiary">?colorTertiary200</item>
<item name="colorM3OnTertiary">?colorTertiary800</item>
<item name="colorM3TertiaryContainer">?colorTertiary700</item>
<item name="colorM3OnTertiaryContainer">?colorTertiary100</item>
<item name="colorM3Background">?colorGray900</item>
<item name="colorM3OnBackground">?colorGray100</item>
<item name="colorM3Surface">?colorGray900</item>
<item name="colorM3OnSurface">?colorGray100</item>
<item name="colorM3SurfaceVariant">?colorNeutral700</item>
<item name="colorM3OnSurfaceVariant">?colorNeutral200</item>
<item name="colorM3Outline">?colorNeutral400</item>
<item name="colorM3DisabledBackground">#1FE3E3E3</item>
<item name="colorM3PressedOverlay">?colorPrimary200</item>
<item name="colorM3Error">#F2B8B5</item>
<item name="colorM3OnError">#601410</item>
<item name="colorM3ErrorContainer">#8C1D18</item>
<item name="colorM3OnErrorContainer">#F9DEDC</item>
<!-- colors for button_bg|text_primary|secondary_dark|light_on_light|dark.xml -->
<item name="colorButtonBackgroundPrimaryDarkOnLight">?colorGray800</item>
<item name="colorButtonBackgroundPrimaryDarkOnLightDisabled">?colorGray300</item>
<item name="colorButtonTextPrimaryDarkOnLight">?colorGray50</item>
<item name="colorButtonTextPrimaryDarkOnLightDisabled">?colorGray400</item>
<item name="colorButtonBackgroundPrimaryLightOnDark">?colorGray100</item>
<item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">?colorGray500</item>
<item name="colorButtonTextPrimaryLightOnDark">?colorGray800</item>
<item name="colorButtonTextPrimaryLightOnDarkDisabled">?colorGray400</item>
<item name="colorButtonBackgroundSecondaryDarkOnLight">?colorGray25</item>
<item name="colorButtonBackgroundSecondaryDarkOnLightDisabled">?colorGray100</item>
<item name="colorButtonTextSecondaryDarkOnLight">?colorGray800</item>
<item name="colorButtonTextSecondaryDarkOnLightDisabled">?colorGray400</item>
<item name="colorButtonBackgroundSecondaryLightOnDark">?colorGray600</item>
<item name="colorButtonBackgroundSecondaryLightOnDarkDisabled">?colorGray300</item>
<item name="colorButtonTextSecondaryLightOnDark">?colorGray50</item>
<item name="colorButtonTextSecondaryLightOnDarkDisabled">?colorGray400</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="android:textColor">?colorM3OnSurface</item>
<item name="android:textColorPrimary">?colorM3OnSurface</item>
<item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item>
</style>
<style name="Theme.Mastodon.Dark.SplashFragment">
@@ -217,139 +95,42 @@
<item name="colorM3OnSurface">#FFF</item>
</style>
<style name="Theme.Mastodon.Dark.TrueBlack">
<item name="android:navigationBarColor">@color/black</item>
<item name="android:colorBackground">@color/black</item>
<item name="android:statusBarColor">@color/black</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
<item name="colorBackgroundLight">@color/black</item>
<item name="colorButtonText">@color/black</item>
<item name="toolbarBackground">@color/black</item>
<item name="colorPollVoted">?colorGray700</item>
<item name="colorSearchField">?colorGray900</item>
<item name="colorBackgroundLightest">@color/black</item>
<item name="colorBackgroundPopup">?colorGray900</item>
<item name="colorWindowBackground">@color/black</item>
<item name="colorComposeButton">?android:colorAccent</item>
<item name="colorComposeButtonBackground">?colorGray900</item>
<item name="colorM3Background">@color/black</item>
<item name="colorM3Surface">@color/black</item>
<!-- <item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">?colorGray900</item>-->
</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">?toolbarBackground</item>
<item name="android:colorPrimary">?colorM3Background</item>
<item name="android:textColorPrimary">?colorM3OnSurface</item>
<item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item>
<item name="android:toolbarStyle">@style/Widget.Mastodon.Toolbar</item>
<item name="android:textColorPrimary">?colorGray800</item>
<item name="android:textColorSecondary">?colorGray800</item>
<item name="android:actionOverflowButtonStyle">@style/Widget.Mastodon.ActionButton.Overflow</item>
<item name="appkitToolbarElevation">0px</item>
<item name="appkitToolbarBackground">?colorM3Background</item>
<item name="actionBarIconTint">@color/action_bar_icons</item>
<item name="android:titleTextAppearance">@style/action_bar_title</item>
<item name="android:subtitleTextAppearance">@style/action_bar_subtitle</item>
</style>
<style name="Widget.Mastodon.ActionButton.Overflow" parent="android:Widget.Material.ActionButton.Overflow">
<item name="android:src">@drawable/ic_fluent_more_vertical_24_regular</item>
</style>
<style name="Theme.Mastodon.Toolbar.Dark" parent="android:ThemeOverlay.Material.Dark.ActionBar">
<item name="android:colorPrimary">?toolbarBackground</item>
<item name="android:textColorPrimary">?colorGray50</item>
<item name="android:textColorSecondary">?colorGray50</item>
<item name="android:toolbarStyle">@style/Widget.Mastodon.Toolbar</item>
<style name="action_bar_title" parent="android:TextAppearance.Material.Widget.ActionBar.Title">
<item name="android:fontFamily">sans-serif</item>
<item name="android:textColor">?colorM3OnSurface</item>
</style>
<style name="Theme.Mastodon.Toolbar.Dark.TrueBlack" parent="android:ThemeOverlay.Material.Dark.ActionBar">
<item name="android:colorPrimary">?toolbarBackground</item>
<item name="android:toolbarStyle">@style/Widget.Mastodon.Toolbar</item>
<style name="action_bar_subtitle" parent="m3_title_small">
<item name="android:textColor">?colorM3OnSurfaceVariant</item>
</style>
<style name="Theme.Mastodon.Toolbar.Profile">
<item name="android:textColorPrimary">?colorGray25</item>
<item name="android:textColorSecondary">?colorGray25</item>
<item name="android:drawableTint">?colorGray25</item>
<item name="android:popupTheme">?android:actionBarTheme</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">?colorGray25</item>
<item name="android:titleTextColor">#fff</item>
<item name="android:subtitleTextAppearance">@style/m3_body_medium</item>
<item name="android:subtitleTextColor">?colorGray25</item>
</style>
<style name="Widget.Mastodon.Button.Compose">
<item name="android:layout_width">64dp</item>
<item name="android:layout_height">64dp</item>
<item name="android:layout_gravity">end|bottom</item>
<item name="android:layout_marginEnd">16dp</item>
<item name="android:layout_marginBottom">24dp</item>
<item name="android:background">@drawable/bg_fab</item>
<item name="android:scaleType">center</item>
<item name="android:tint">?colorComposeButton</item>
<item name="android:stateListAnimator">@animator/fab_shadow</item>
<item name="android:src">@drawable/ic_fluent_edit_28_filled</item>
<item name="android:contentDescription">@string/new_post</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>
</style>
<style name="Widget.Mastodon.EditText" parent="android:Widget.Material.Light.EditText">
<item name="android:textColorHint">?android:textColorSecondary</item>
<item name="android:elevation">2dp</item>
<item name="android:textAppearance">@style/m3_body_large</item>
<item name="android:subtitleTextColor">#fff</item>
</style>
<style name="Theme.Mastodon.Dialog.Alert" parent="android:Theme.Material.Light.Dialog.Alert">
@@ -359,11 +140,11 @@
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
<!-- colors -->
<item name="android:colorAccent">?colorPrimary700</item>
<item name="android:colorPrimary">?colorGray800</item>
<item name="android:colorBackground">?colorBackgroundPopup</item>
<item name="android:textColorPrimary">?colorGray800</item>
<item name="android:textColorSecondary">?colorGray500</item>
<item name="android:colorAccent">?colorM3Primary</item>
<item name="android:colorPrimary">?colorM3OnSurface</item>
<item name="android:colorBackground">?colorM3OnSurfaceVariant</item>
<item name="android:textColorPrimary">?colorM3OnSurface</item>
<item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item>
</style>
<style name="Theme.Mastodon.Dialog.Alert.Dark" parent="android:Theme.Material.Dialog.Alert">
@@ -371,34 +152,23 @@
<item name="android:dialogPreferredPadding">24dp</item>
<item name="android:windowBackground">@drawable/bg_alert</item>
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
<item name="android:datePickerStyle">@style/Widget.Mastodon.DatePicker.Dark</item>
<item name="android:timePickerStyle">@style/Widget.Mastodon.TimePicker.Dark</item>
<!-- colors -->
<item name="android:colorAccent">?colorPrimary600</item>
<item name="android:colorPrimary">?colorGray50</item>
<item name="android:colorBackground">?colorBackgroundPopup</item>
<item name="android:textColorPrimary">?colorGray50</item>
<item name="android:textColorSecondary">?colorGray400</item>
</style>
<style name="Widget.Mastodon.DatePicker.Dark" parent="@android:style/Widget.Material.DatePicker">
<item name="android:headerBackground">?colorGray700</item>
</style>
<style name="Widget.Mastodon.TimePicker.Dark" parent="@android:style/Widget.Material.TimePicker">
<item name="android:headerBackground">?colorGray700</item>
<item name="android:numbersBackgroundColor">?colorGray700</item>
<item name="android:colorAccent">?colorM3Primary</item>
<item name="android:colorPrimary">?colorM3OnSurface</item>
<item name="android:colorBackground">?colorM3OnSurfaceVariant</item>
<item name="android:textColorPrimary">?colorM3OnSurface</item>
<item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item>
</style>
<style name="Widget.Mastodon.ButtonBarButton" parent="android:Widget.Material.Button.Borderless">
<item name="android:textAllCaps">false</item>
<item name="android:layout_marginEnd">8dp</item>
<item name="android:minHeight">40dp</item>
<item name="android:minHeight">48dp</item>
<item name="android:minWidth">0px</item>
<item name="android:background">@drawable/bg_alert_button</item>
<item name="android:textAppearance">@style/m3_label_large</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:textColor">@color/button_text_m3_text</item>
</style>
<style name="Widget.Mastodon.PopupMenu" parent="android:Widget.Material.Light.PopupMenu">
@@ -408,37 +178,63 @@
<style name="Widget.Mastodon.M3.Button" parent="android:Widget.Material.Button">
<item name="android:textAllCaps">false</item>
<item name="android:textSize">14sp</item>
<item name="android:minHeight">40dp</item>
<item name="android:minHeight">48dp</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:stateListAnimator">@null</item>
<item name="android:paddingStart">24dp</item>
<item name="android:paddingEnd">24dp</item>
<item name="android:drawablePadding">8dp</item>
</style>
<style name="Widget.Mastodon.M3.Button.Icon">
<item name="android:paddingStart">16dp</item>
</style>
<style name="Widget.Mastodon.M3.Button.Filled">
<item name="android:background">@drawable/bg_button_m3_filled</item>
<item name="android:textColor">@color/button_text_m3_filled</item>
<item name="android:paddingLeft">24dp</item>
<item name="android:paddingRight">24dp</item>
<item name="android:drawableTint">@color/button_text_m3_filled</item>
</style>
<style name="Widget.Mastodon.M3.Button.Filled.Icon">
<item name="android:paddingStart">16dp</item>
</style>
<style name="Widget.Mastodon.M3.Button.Filled.Elevated">
<item name="android:stateListAnimator">@animator/m3_button_elevation</item>
</style>
<style name="Widget.Mastodon.M3.Button.Text">
<item name="android:background">@drawable/bg_button_m3_text</item>
<item name="android:textColor">@color/button_text_m3_text</item>
<item name="android:paddingLeft">24dp</item>
<item name="android:paddingRight">24dp</item>
<item name="android:drawableTint">@color/button_text_m3_text</item>
</style>
<style name="Widget.Mastodon.M3.Button.Text.Icon">
<item name="android:paddingStart">16dp</item>
</style>
<style name="Widget.Mastodon.M3.Button.Tonal">
<item name="android:background">@drawable/bg_button_m3_tonal</item>
<item name="android:textColor">@color/button_text_m3_text</item>
<item name="android:paddingLeft">24dp</item>
<item name="android:paddingRight">24dp</item>
<item name="android:textColor">@color/button_text_m3_tonal</item>
<item name="android:drawableTint">@color/button_text_m3_tonal</item>
</style>
<style name="Widget.Mastodon.M3.Button.Tonal.Icon">
<item name="android:paddingStart">16dp</item>
</style>
<style name="Widget.Mastodon.M3.Button.Tonal.Error">
<item name="android:background">@drawable/bg_button_m3_tonal_error</item>
<item name="android:textColor">@color/button_text_m3_tonal_error</item>
<item name="android:drawableTint">@color/button_text_m3_tonal_error</item>
</style>
<style name="Widget.Mastodon.M3.Button.Tonal.Error.Icon">
<item name="android:paddingStart">16dp</item>
</style>
<style name="Widget.Mastodon.M3.Button.Outlined">
<item name="android:background">@drawable/bg_button_m3_outlined</item>
<item name="android:textColor">@color/button_text_m3_text</item>
<item name="android:paddingLeft">24dp</item>
<item name="android:paddingRight">24dp</item>
<item name="android:drawableTint">@color/button_text_m3_text</item>
</style>
<style name="Widget.Mastodon.M3.Button.Outlined.Icon">
<item name="android:paddingStart">16dp</item>
</style>
<style name="Widget.Mastodon.M3.EditText" parent="android:Widget.Material.EditText">
@@ -448,16 +244,59 @@
<item name="android:paddingRight">16dp</item>
<item name="android:paddingTop">8dp</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:minHeight">40dp</item>
<item name="android:minHeight">48dp</item>
<item name="android:textColorHint">?colorM3OnSurfaceVariant</item>
<item name="android:textColor">?colorM3OnSurface</item>
</style>
<style name="Widget.Mastodon.M3.SegmentedButtonContainer" parent="">
<item name="android:divider">@drawable/divider_vertical_outline</item>
<item name="android:showDividers">middle</item>
<item name="android:foreground">@drawable/fg_segmented_button_container</item>
</style>
<style name="Widget.Mastodon.M3.SegmentedButton" parent="">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:background">@drawable/bg_segmented_button</item>
</style>
<style name="Widget.Mastodon.M3.SegmentedButtonText" parent="">
<item name="android:textAppearance">@style/m3_label_large</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_gravity">center_horizontal</item>
<item name="android:gravity">center_vertical</item>
<item name="android:drawablePadding">8dp</item>
<item name="android:textColor">@color/text_segmented_button</item>
<item name="android:duplicateParentState">true</item>
</style>
<style name="Theme.Mastodon.Toolbar.ProgressBar">
<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">24sp</item>
<item name="android:minHeight">38dp</item>
<item name="android:gravity">center_vertical</item>
<item name="android:gravity">bottom</item>
<item name="android:maxLines">2</item>
<item name="android:singleLine">false</item>
<item name="android:textColor">?colorM3OnSurface</item>
</style>
<style name="sheet_title">
@@ -467,80 +306,73 @@
<style name="m3_body_large">
<item name="android:textSize">16sp</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:lineSpacingExtra">5dp</item>
<item name="android:lineHeight" tools:ignore="NewApi">24dp</item>
</style>
<style name="m3_body_medium">
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:lineSpacingExtra">4dp</item>
</style>
<style name="m3_body_small">
<item name="android:textSize">12sp</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">16sp</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">14sp</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">11sp</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">12sp</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:lineSpacingMultiplier">1.14</item>
<item name="android:lineHeight" tools:ignore="NewApi">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">14sp</item>
</style>
<style name="m3_title_large">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">22sp</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
<style name="app_title" parent="m3_title_large">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textAllCaps">true</item>
<item name="android:letterSpacing">0.1</item>
</style>
<style name="role_label">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:background">@drawable/bg_pill</item>
<item name="android:paddingStart">8dp</item>
<item name="android:paddingEnd">8dp</item>
<item name="android:paddingTop">6dp</item>
<item name="android:paddingBottom">6dp</item>
<item name="android:textAppearance">@style/m3_label_large</item>
<item name="android:textColor">?colorM3OnSurfaceVariant</item>
<item name="android:background">@drawable/bg_role_chip</item>
<item name="android:paddingStart">16dp</item>
<item name="android:paddingEnd">16dp</item>
<item name="android:paddingTop">2dp</item>
<item name="android:paddingBottom">2dp</item>
<item name="android:layout_marginEnd">8dp</item>
<item name="android:minHeight">32dp</item>
<item name="android:gravity">center_vertical</item>
</style>
<style name="m3_headline_small">
<item name="android:textSize">24sp</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
<style name="m3_headline_medium">
<item name="android:textSize">28sp</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:lineSpacingExtra">3dp</item>
</style>

View File

@@ -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>

View 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>

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="repo_url" translatable="false">https://github.com/sk22/megalodon</string>
<string name="privacy_policy_url" translatable="false">https://joinmastodon.org/privacy-policy</string>
<string name="donate_url" translatable="false">https://ko-fi.com/xsk22</string>
</resources>