Merge remote-tracking branch 'megalodon_main/main' into m3-merger
# Conflicts: # README.md # build.gradle # mastodon/build.gradle # mastodon/src/main/AndroidManifest.xml # mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java # mastodon/src/main/java/org/joinmastodon/android/MainActivity.java # mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java # mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java # mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java # mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java # mastodon/src/main/java/org/joinmastodon/android/model/Status.java # mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java # mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java # mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java # mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml # mastodon/src/main/res/color/button_text_primary_light_on_dark.xml # mastodon/src/main/res/drawable/bg_image_alt_text_overlay.xml # mastodon/src/main/res/drawable/bg_rect_4dp_ripple.xml # mastodon/src/main/res/drawable/bg_search_field.xml # mastodon/src/main/res/drawable/ic_fluent_save_24_regular.xml # mastodon/src/main/res/layout/compose_action.xml # mastodon/src/main/res/layout/compose_media_thumb.xml # mastodon/src/main/res/layout/compose_poll_option.xml # mastodon/src/main/res/layout/display_item_footer.xml # mastodon/src/main/res/layout/display_item_header.xml # mastodon/src/main/res/layout/display_item_text.xml # mastodon/src/main/res/layout/fragment_compose.xml # mastodon/src/main/res/layout/fragment_profile.xml # mastodon/src/main/res/layout/item_instance_category.xml # mastodon/src/main/res/layout/item_report_choice.xml # mastodon/src/main/res/layout/item_settings_footer.xml # mastodon/src/main/res/layout/item_settings_switch.xml # mastodon/src/main/res/layout/item_settings_theme.xml # mastodon/src/main/res/layout/item_settings_theme_subitem.xml # mastodon/src/main/res/layout/item_settings_update.xml # mastodon/src/main/res/layout/tab_bar.xml # mastodon/src/main/res/menu/mute_duration.xml # mastodon/src/main/res/values-de-rDE/strings_sk.xml # mastodon/src/main/res/values-es-rES/strings_sk.xml # mastodon/src/main/res/values-fa/strings_sk.xml # mastodon/src/main/res/values-night/colors.xml # mastodon/src/main/res/values-nl-rNL/strings_sk.xml # mastodon/src/main/res/values-uk-rUA/strings_sk.xml # mastodon/src/main/res/values-zh-rCN/strings_sk.xml # mastodon/src/main/res/values/attrs.xml # mastodon/src/main/res/values/ids.xml # mastodon/src/main/res/values/styles.xml # metadata/es/changelogs/83.txt
This commit is contained in:
LucasGGamerM
@@ -1,50 +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="favorite_selected" format="color"/>
|
||||
<attr name="bookmark_selected" 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"/>
|
||||
@@ -64,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" />
|
||||
@@ -104,12 +55,10 @@
|
||||
<attr name="colorGray200" format="color" />
|
||||
<attr name="colorGray300" format="color" />
|
||||
<attr name="colorGray400" format="color" />
|
||||
<attr name="colorGray400t" format="color" />
|
||||
<attr name="colorGray500" format="color" />
|
||||
<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" />
|
||||
@@ -147,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>
|
||||
Reference in New Issue
Block a user