merge: update to latest master
This commit is contained in:
FineFindus
@@ -5,10 +5,13 @@
|
||||
<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"/>
|
||||
|
||||
@@ -37,7 +37,8 @@
|
||||
<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_disable_dividers">Disable toot dividers</string>
|
||||
<string name="sk_disable_dividers">Disable post dividers</string>
|
||||
<string name="sk_relocate_publish_button">Relocate publish button</string>
|
||||
<string name="sk_settings_contribute">Contribute to Moshidon</string>
|
||||
<string name="sk_settings_show_federated_timeline">Show federated timeline</string>
|
||||
<string name="sk_notification_type_status">Posts</string>
|
||||
@@ -64,7 +65,7 @@
|
||||
<string name="sk_welcome_title">Welcome!</string>
|
||||
<string name="sk_welcome_text">The shark salutes you! To get started, please enter your home instance’s domain name below.</string>
|
||||
<string name="sk_example_domain">example.social</string>
|
||||
<string name="sk_app_username" translatable="false">\@megalodon</string>
|
||||
<string name="sk_app_username" translatable="false">\@moshidon</string>
|
||||
<string name="sk_tabs_disable_swipe">Disable swiping between tabs</string>
|
||||
<string name="sk_settings_profile">Set up profile</string>
|
||||
<string name="sk_personal_note">Add a note about this profile</string>
|
||||
@@ -83,15 +84,68 @@
|
||||
<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_show_differentiated_notification_icons">Custom icons for interactions</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_hide_translate_in_timeline">Hide translate button in timeline</string>
|
||||
<string name="sk_settings_translate_only_opened">Only translate opened posts</string>
|
||||
<string name="sk_settings_translation_availability_note_available">%s supports translation!</string>
|
||||
<string name="sk_settings_translation_availability_note_unavailable">%s does not appear to support translation.</string>
|
||||
<string name="sk_loading_fediverse_resource_title">Looking it up on the Fediverse…</string>
|
||||
<string name="sk_loading_fediverse_resource_title">Looking it up on the Fediverse</string>
|
||||
<string name="sk_loading_resource_on_instance_title">Looking it up on %s</string>
|
||||
<string name="sk_undo_reblog">Undo reblog</string>
|
||||
<string name="sk_reblog_with_visibility">Reblog with visibility</string>
|
||||
<string name="sk_quote_post">Post about this</string>
|
||||
<string name="sk_hashtags_you_follow">Hashtags you follow</string>
|
||||
<string name="sk_copy_link_to_post">Copy link to post</string>
|
||||
<string name="sk_open_in_account">Open in other account</string>
|
||||
<string name="sk_open_with_account">Open with other account</string>
|
||||
<string name="sk_resource_not_found">Resource could not be found</string>
|
||||
<string name="sk_bookmark_as">Bookmark with other account</string>
|
||||
<string name="sk_bookmarked_as">Bookmarked as %s</string>
|
||||
<string name="sk_already_bookmarked">Already bookmarked</string>
|
||||
<string name="sk_favorite_as">Favorite with other account</string>
|
||||
<string name="sk_favorited_as">Favorited as %s</string>
|
||||
<string name="sk_already_favorited">Already favorited</string>
|
||||
<string name="sk_reblog_as">Reblog with other account</string>
|
||||
<string name="sk_reblogged_as">Reblogged as %s</string>
|
||||
<string name="sk_already_reblogged">Already reblogged</string>
|
||||
<string name="sk_reply_as">Reply with other account</string>
|
||||
<string name="sk_settings_uniform_icon_for_notifications">Uniform icon for all notifications</string>
|
||||
<string name="sk_forward_report_to">Forward to %s</string>
|
||||
<string name="sk_unsent_posts">Unsent posts</string>
|
||||
<string name="sk_draft">Draft</string>
|
||||
<string name="sk_schedule">Schedule</string>
|
||||
<string name="sk_confirm_delete_draft_title">Delete draft</string>
|
||||
<string name="sk_confirm_delete_draft">Are you sure you want to delete this drafted post?</string>
|
||||
<string name="sk_confirm_delete_scheduled_post_title">Delete scheduled post</string>
|
||||
<string name="sk_confirm_delete_scheduled_post">Are you sure you want to delete this scheduled post?</string>
|
||||
<string name="sk_draft_or_schedule">Draft or schedule</string>
|
||||
<string name="sk_compose_draft">Post will be saved as a draft.</string>
|
||||
<string name="sk_compose_scheduled">Scheduled for</string>
|
||||
<string name="sk_draft_saved">Draft saved</string>
|
||||
<string name="sk_post_scheduled">Post scheduled</string>
|
||||
<string name="sk_scheduled_too_soon_title">Scheduled time is too soon</string>
|
||||
<string name="sk_scheduled_too_soon">Post must be scheduled at least 10 minutes in the future.</string>
|
||||
<string name="sk_confirm_save_draft">Save draft?</string>
|
||||
<string name="sk_confirm_save_changes">Save changes?</string>
|
||||
<string name="sk_mark_as_draft">Mark as draft</string>
|
||||
<string name="sk_schedule_post">Schedule post</string>
|
||||
<string name="sk_schedule_or_draft">Schedule or draft</string>
|
||||
<string name="sk_compose_no_schedule">Don’t schedule</string>
|
||||
<string name="sk_compose_no_draft">Don’t draft</string>
|
||||
<string name="sk_settings_reduce_motion">Reduce motion in animations</string>
|
||||
<string name="sk_bot_account">This is a bot account</string>
|
||||
<string name="sk_no_image_desc_title">No Image description</string>
|
||||
<string name="sk_no_image_desc">The included images have no description. Please consider adding one, to allow visually impaired people to participate.</string>
|
||||
<string name="sk_emoji_recent">Recently used</string>
|
||||
<string name="sk_clear_recent_emoji">Clear recently used emoji</string>
|
||||
<string name="sk_disable_relocate_publish_button_to_enable_customization">Disable "Relocate publish button" to allow customization</string>
|
||||
<string name="sk_keep_only_latest_notification">Keep only latest notification</string>
|
||||
<string name="sk_announcements">Announcements</string>
|
||||
<string name="sk_mark_as_read">Mark as read</string>
|
||||
|
||||
<!-- accessibility labels-->
|
||||
<string name="sk_poll_option_add">Add new poll option</string>
|
||||
<string name="sk_fab_compose">Compose</string>
|
||||
<string name="sk_sending_error">Error publishing</string>
|
||||
|
||||
</resources>
|
||||
@@ -19,7 +19,7 @@
|
||||
<item name="android:textColorPrimary">?colorGray800</item>
|
||||
<item name="android:textColorSecondary">?colorGray500</item>
|
||||
<item name="colorButtonText">?colorGray50</item>
|
||||
<item name="colorSecondary">#E9EDF2</item>
|
||||
<item name="colorSecondary">?colorGray200</item>
|
||||
<item name="colorBackgroundLight">?colorGray50</item>
|
||||
<item name="colorBackgroundLightest">?colorGray25</item>
|
||||
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
|
||||
@@ -29,6 +29,8 @@
|
||||
<item name="android:navigationBarColor">?android:statusBarColor</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>
|
||||
@@ -38,6 +40,9 @@
|
||||
<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>
|
||||
@@ -113,7 +118,7 @@
|
||||
<item name="android:textColorPrimary">?colorGray50</item>
|
||||
<item name="android:textColorSecondary">?colorGray400</item>
|
||||
<item name="colorButtonText">?colorGray800</item>
|
||||
<item name="colorSecondary">#E9EDF2</item>
|
||||
<item name="colorSecondary">?colorGray200</item>
|
||||
<item name="colorBackgroundLight">?colorGray700</item>
|
||||
<item name="colorBackgroundLightest">?colorGray900</item>
|
||||
<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
|
||||
@@ -123,6 +128,8 @@
|
||||
<item name="android:navigationBarColor">?android:statusBarColor</item>
|
||||
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark</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>
|
||||
@@ -132,6 +139,10 @@
|
||||
<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>
|
||||
@@ -199,6 +210,8 @@
|
||||
<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">?colorGray100</item>
|
||||
|
||||
<item name="colorM3Background">#000</item>
|
||||
<!-- <item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">?colorGray900</item>-->
|
||||
@@ -223,6 +236,7 @@
|
||||
|
||||
<style name="Theme.Mastodon.Toolbar.Dark.TrueBlack" parent="android:ThemeOverlay.Material.Dark.ActionBar">
|
||||
<item name="android:colorPrimary">@color/black</item>
|
||||
<item name="android:toolbarStyle">@style/Widget.Mastodon.Toolbar</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Mastodon.Toolbar.Profile">
|
||||
@@ -236,6 +250,20 @@
|
||||
<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>
|
||||
@@ -307,7 +335,7 @@
|
||||
<!-- colors -->
|
||||
<item name="android:colorAccent">?colorPrimary700</item>
|
||||
<item name="android:colorPrimary">?colorGray800</item>
|
||||
<item name="android:colorBackground">?colorGray100</item>
|
||||
<item name="android:colorBackground">?colorBackgroundPopup</item>
|
||||
<item name="android:textColorPrimary">?colorGray800</item>
|
||||
<item name="android:textColorSecondary">?colorGray500</item>
|
||||
</style>
|
||||
@@ -317,15 +345,26 @@
|
||||
<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">?colorGray700</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>
|
||||
</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>
|
||||
@@ -342,7 +381,7 @@
|
||||
|
||||
<style name="Widget.Mastodon.M3.Button" parent="android:Widget.Material.Button">
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textSize">14dp</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
<item name="android:minHeight">40dp</item>
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:stateListAnimator">@null</item>
|
||||
@@ -364,45 +403,45 @@
|
||||
|
||||
<style name="alert_title">
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:textSize">24dp</item>
|
||||
<item name="android:textSize">24sp</item>
|
||||
<item name="android:minHeight">38dp</item>
|
||||
<item name="android:gravity">bottom</item>
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_body_large">
|
||||
<item name="android:textSize">16dp</item>
|
||||
<item name="android:textSize">16sp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:lineSpacingExtra">5dp</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_body_medium">
|
||||
<item name="android:textSize">14dp</item>
|
||||
<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">12dp</item>
|
||||
<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">16dp</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">14dp</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
<item name="android:textColor">?android:textColorSecondary</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_label_medium">
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textSize">12dp</item>
|
||||
<item name="android:textSize">12sp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:lineSpacingMultiplier">1.14</item>
|
||||
</style>
|
||||
@@ -410,12 +449,12 @@
|
||||
<style name="m3_label_large">
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textColor">?android:textColorSecondary</item>
|
||||
<item name="android:textSize">14dp</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_title_large">
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textSize">22dp</item>
|
||||
<item name="android:textSize">22sp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
@@ -426,12 +465,12 @@
|
||||
</style>
|
||||
|
||||
<style name="m3_headline_small">
|
||||
<item name="android:textSize">24dp</item>
|
||||
<item name="android:textSize">24sp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="m3_headline_medium">
|
||||
<item name="android:textSize">28dp</item>
|
||||
<item name="android:textSize">28sp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:lineSpacingExtra">3dp</item>
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user