owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

Browse Source 
# 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
2023-08-20 11:36:16 -03:00
parent 8f4363a2d8
commit 93818903c8
753 changed files with 28298 additions and 14085 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
mastodon/src/main/res/layout/edit_timeline.xml
View File

@@ -15,22 +15,23 @@
<ImageButton
android:id="@+id/button"
style="?android:editTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="4dp"
android:layout_marginBottom="16dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/sk_timeline_icon"
android:paddingHorizontal="14dp" />
android:background="@drawable/bg_m3_outlined_text_field_nopad"
android:minHeight="48dp"
android:minWidth="48dp"
android:tint="?colorM3OnSurface"
android:tooltipText="@string/sk_timeline_icon"
android:contentDescription="@string/sk_timeline_icon" />
<EditText
android:id="@+id/input"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="16dp"
android:layout_marginStart="6dp"
android:layout_marginEnd="24dp"
android:layout_weight="1" />
@@ -41,18 +42,18 @@
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?colorPollVoted" />
android:layout_marginTop="24dp"
android:visibility="gone"
android:background="?colorM3Outline" />
<Button
android:id="@+id/advanced"
style="@style/Widget.Mastodon.M3.Button.Outlined"
android:background="@drawable/bg_button_m3_tonal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="16dp"
android:minHeight="32dp"
android:background="@drawable/bg_inline_button"
android:elevation="0dp"
android:fontFamily="sans-serif-medium"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"
@@ -62,6 +63,7 @@
android:id="@+id/tag_wrap"
android:orientation="vertical"
android:visibility="gone"
android:layout_marginTop="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -97,7 +99,7 @@
android:textColor="?android:textColorSecondary" />
<com.hootsuite.nachos.NachoTextView
style="@style/Widget.Mastodon.EditText"
style="@style/Widget.Mastodon.M3.EditText"
android:id="@+id/tags_any"
android:hint="@string/sk_edit_timeline_tags_hint"
android:paddingVertical="8sp"
@@ -105,7 +107,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="16dp"
app:chipBackground="?colorAccentLightest"
app:chipBackground="?colorM3SecondaryContainer"
app:chipTextColor="?android:textColorPrimary" />
<TextView
@@ -120,7 +122,7 @@
android:textColor="?android:textColorSecondary" />
<com.hootsuite.nachos.NachoTextView
style="@style/Widget.Mastodon.EditText"
style="@style/Widget.Mastodon.M3.EditText"
android:id="@+id/tags_all"
android:hint="@string/sk_edit_timeline_tags_hint"
android:paddingVertical="8sp"
@@ -128,7 +130,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="16dp"
app:chipBackground="?colorAccentLightest"
app:chipBackground="?colorM3SecondaryContainer"
app:chipTextColor="?android:textColorPrimary" />
<TextView
@@ -143,7 +145,7 @@
android:textColor="?android:textColorSecondary" />
<com.hootsuite.nachos.NachoTextView
style="@style/Widget.Mastodon.EditText"
style="@style/Widget.Mastodon.M3.EditText"
android:id="@+id/tags_none"
android:hint="@string/sk_edit_timeline_tags_hint"
android:paddingVertical="8sp"
@@ -151,7 +153,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="16dp"
app:chipBackground="?colorAccentLightest"
app:chipBackground="?colorM3SecondaryContainer"
app:chipTextColor="?android:textColorPrimary" />
<TextView
@@ -169,7 +171,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="16dp"
android:minHeight="48dp"
android:gravity="center_vertical"
android:layoutDirection="locale">
@@ -186,7 +187,7 @@
android:drawablePadding="16dp"
android:text="@string/sk_hashtag_timeline_local_only_switch" />
<Switch
<org.joinmastodon.android.ui.views.M3Switch
android:id="@+id/local_only_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"