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
2023-08-20 11:36:16 -03:00
parent 8f4363a2d8
commit 93818903c8
753 changed files with 28298 additions and 14085 deletions
--- a/mastodon/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml
+++ b/mastodon/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M0,0h108v108h-108z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="54"
+          android:startY="0"
+          android:endX="54"
+          android:endY="108"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF6364FF"/>
+        <item android:offset="1" android:color="#FF563ACC"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
--- a/mastodon/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
+++ b/mastodon/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M63.51,35.47C67.74,36.09 71.31,39.31 71.86,43.39C72.1,45.82 71.98,49.47 71.92,51.24C71.9,51.68 71.89,52.01 71.89,52.17C71.89,52.41 71.86,54.58 71.85,54.81C71.48,60.65 67.83,62.95 64,63.69C63.95,63.7 63.91,63.71 63.86,63.72C63.85,63.72 63.83,63.72 63.82,63.72C61.39,64.2 58.79,64.32 56.32,64.39C55.73,64.41 55.14,64.41 54.55,64.41L54.55,64.41C52.1,64.41 49.65,64.12 47.26,63.54C47.25,63.54 47.24,63.54 47.22,63.54C47.21,63.55 47.2,63.55 47.19,63.56C47.18,63.57 47.17,63.58 47.17,63.59C47.16,63.6 47.16,63.62 47.16,63.63C47.23,64.4 47.39,65.17 47.66,65.9C47.99,66.74 49.15,68.78 53.44,68.78C55.94,68.78 58.42,68.49 60.85,67.91C60.86,67.91 60.88,67.91 60.89,67.91C60.9,67.92 60.91,67.92 60.92,67.93C60.93,67.94 60.94,67.95 60.95,67.96C60.95,67.97 60.95,67.98 60.95,67.99L60.95,70.86C60.95,70.87 60.95,70.89 60.94,70.9C60.94,70.91 60.93,70.92 60.92,70.93C60.16,71.48 59.14,71.8 58.25,72.08C58.21,72.09 58.17,72.11 58.12,72.12C57.72,72.25 57.31,72.36 56.89,72.46C53.1,73.32 49.15,73.11 45.47,71.85C42.04,70.65 38.53,67.71 37.67,64.17C37.2,62.25 36.88,60.3 36.69,58.34C36.5,56.19 36.43,54.04 36.36,51.89C36.34,51.08 36.31,50.27 36.28,49.45C36.2,47.38 36.25,45.13 36.69,43.09C37.6,38.96 41.35,36.07 45.46,35.47C45.55,35.45 45.64,35.44 45.75,35.42C46.56,35.28 48.26,34.98 53.78,34.98L53.83,34.98C60.09,34.98 62.8,35.36 63.51,35.47ZM65.64,58L65.64,47.91C65.64,45.85 65.11,44.21 64.06,43C62.96,41.79 61.54,41.16 59.76,41.16C57.72,41.16 56.16,41.95 55.13,43.52L54.13,45.19L53.13,43.52C52.1,41.95 50.55,41.16 48.5,41.16C46.72,41.16 45.3,41.79 44.21,43C43.15,44.21 42.62,45.85 42.62,47.91L42.62,58L46.63,58L46.63,48.21C46.63,46.15 47.5,45.1 49.24,45.1C51.17,45.1 52.14,46.34 52.14,48.8L52.14,54.16L56.12,54.16L56.12,48.8C56.12,46.34 57.09,45.1 59.01,45.1C60.77,45.1 61.63,46.15 61.63,48.21L61.63,58L65.64,58Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="54.12"
+          android:startY="34.98"
+          android:endX="54.12"
+          android:endY="72.98"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFF0F3FE"/>
+        <item android:offset="1" android:color="#FFDAE0FB"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>