Merge remote-tracking branch 'megalodon_main/main'

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/res/layout/display_item_poll_option.xml
#	mastodon/src/main/res/menu/profile_own.xml
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
#	mastodon/src/main/res/values/strings_sk.xml

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BlockedAccountsListFragment.java

@@ -0,0 +1,36 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.net.Uri;
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountBlocks;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+
+public class BlockedAccountsListFragment extends AccountRelatedAccountListFragment{
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.sk_blocked_accounts);
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetAccountBlocks(maxID, count);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		super.onConfigureViewHolder(holder);
+		holder.setStyle(AccountViewHolder.AccessoryType.NONE, false);
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return super.getWebUri(base).buildUpon()
+				.appendPath("/blocks").build();
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/MutedAccountsListFragment.java

@@ -0,0 +1,36 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.net.Uri;
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountMutes;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+
+public class MutedAccountsListFragment extends AccountRelatedAccountListFragment{
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.sk_muted_accounts);
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetAccountMutes(maxID, count);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		super.onConfigureViewHolder(holder);
+		holder.setStyle(AccountViewHolder.AccessoryType.NONE, false);
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return super.getWebUri(base).buildUpon()
+				.appendPath("/mutes").build();
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java

@@ -80,7 +80,7 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 			progressBg=activity.getResources().getDrawable(R.drawable.bg_poll_option_voted, activity.getTheme()).mutate();
 			progressBgInset=activity.getResources().getDrawable(R.drawable.bg_poll_option_voted_inset, activity.getTheme()).mutate();
 			itemView.setOnClickListener(this::onButtonClick);
-			button.setOutlineProvider(OutlineProviders.M3_BUTTON);
+			button.setOutlineProvider(OutlineProviders.roundedRect(20));
 			button.setClipToOutline(true);
 		}
 

mastodon/src/main/res/drawable/bg_poll_option_clickable.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
-	<item android:gravity="center_vertical" android:height="40dp">
+	<item>
 		<shape>
 			<stroke android:width="1dp" android:color="?colorM3Outline"/>
 			<corners android:radius="20dp"/>
 		</shape>
 	</item>
-	<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
+	<item android:id="@android:id/mask">
 		<shape>
 			<solid android:color="#000"/>
 			<corners android:radius="20dp"/>

mastodon/src/main/res/drawable/bg_poll_option_clickable_inset.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
-	<item android:gravity="center_vertical" android:height="40dp">
+	<item>
 		<shape>
 			<stroke android:width="1dp" android:color="?colorM3Outline"/>
 			<solid android:color="?colorM3Surface"/>
 			<corners android:radius="20dp"/>
 		</shape>
 	</item>
-	<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
+	<item android:id="@android:id/mask">
 		<shape>
 			<solid android:color="#000"/>
 			<corners android:radius="20dp"/>

mastodon/src/main/res/drawable/bg_poll_option_voted.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:gravity="center_vertical" android:height="40dp">
+	<item>
 		<scale android:scaleGravity="start|fill_vertical" android:scaleWidth="100%">
 			<shape>
 				<solid android:color="?colorM3SecondaryContainer"/>
@@ -8,7 +8,7 @@
 			</shape>
 		</scale>
 	</item>
-	<item android:gravity="center_vertical" android:height="40dp">
+	<item>
 		<shape>
 			<stroke android:width="1dp" android:color="?colorM3OutlineVariant"/>
 			<corners android:radius="20dp"/>

mastodon/src/main/res/drawable/bg_poll_option_voted_inset.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:gravity="center_vertical" android:height="40dp">
+	<item>
 		<shape>
 			<solid android:color="?colorM3Surface"/>
 			<corners android:radius="20dp"/>
 		</shape>
 	</item>
-	<item android:gravity="center_vertical" android:height="40dp">
+	<item>
 		<scale android:scaleGravity="start|fill_vertical" android:scaleWidth="100%">
 			<shape>
 				<solid android:color="@color/poll_option_progress_inset"/>
@@ -14,7 +14,7 @@
 			</shape>
 		</scale>
 	</item>
-	<item android:gravity="center_vertical" android:height="40dp">
+	<item>
 		<shape>
 			<stroke android:width="1dp" android:color="?colorM3Outline"/>
 			<corners android:radius="20dp"/>

mastodon/src/main/res/values-pt-rBR/strings_sk.xml

@@ -342,7 +342,7 @@
     </plurals>
     <string name="sk_mute_label">Duração</string>
     <string name="sk_button_react">Reaja com emoji</string>
-    <string name="sk_enter_emoji_toast">Por favor, digite um emoji</string>
+    <string name="sk_enter_emoji_toast">Você precisa digitar um emoji</string>
     <string name="sk_enter_emoji_hint">Digite para reagir com um emoji</string>
     <string name="sk_again_for_system_keyboard">Toque novamente para Teclado do Sistema</string>
     <string name="sk_duration_minutes_5">5 minutos</string>
@@ -370,31 +370,5 @@
     <string name="sk_settings_auto_reveal_equal_spoilers">Revelar automaticamente Avisos de Conteúdo nas respostas</string>
     <string name="sk_icon_recycle_bin">Lixeira de reciclagem</string>
     <string name="sk_tab_search">Pesquisar</string>
-    <string name="sk_time_minutes">%d minutos</string>
-    <string name="sk_time_hours">%d horas</string>
     <string name="sk_suicide_search_terms">Suicídio</string>
-    <string name="sk_time_seconds">%d segundos</string>
-    <string name="sk_time_days">%d dias</string>
-    <string name="sk_settings_show_emoji_reactions_only_opened">Somente quando a publicação for aberta</string>
-    <string name="sk_settings_show_emoji_reactions_hide_empty">Ocultar reações de emoji vazias</string>
-    <string name="sk_settings_show_emoji_reactions">Mostrar reações com emojis nas linhas do tempo</string>
-    <string name="sk_settings_show_emoji_reactions_always">Sempre mostrar o botão adicionar</string>
-    <string name="sk_search_suicide_title">Caso você precise de ajuda…</string>
-    <string name="sk_disable_pill_shaped_active_indicator">Desativar indicador de guia ativa em forma de comprimido</string>
-    <string name="sk_tab_home">Início</string>
-    <string name="sk_settings_show_labels_in_navigation_bar">Mostrar nomes das guias na barra de navegação</string>
-    <string name="sk_load_missing_posts_below">Carregar publicações mais antigas</string>
-    <string name="sk_do_not_show_again">Não mostrar novamente</string>
-    <string name="sk_search_suicide_hotlines">Encontre uma linha de apoio</string>
-    <string name="sk_trending_links_info_banner">Estas são as notícias mais comentadas em seu servidor.</string>
-    <string name="sk_post_contains_media">A publicação contém mídia</string>
-    <string name="sk_load_missing_posts_above">Carregar publicações mais recentes</string>
-    <string name="sk_search_suicide_message">Se você está procurando um sinal para não se matar, aqui está. Por favor, caso esteja deprimido e/ou tendo pensamentos suicidas, considere entrar em contato com uma linha de apoio para prevenção do suicídio.</string>
-    <string name="sk_suicide_helplines_url">https://findahelpline.com/br</string>
-    <string name="sk_trending_posts_info_banner">Essas são as publicações que estão ganhando força no seu servidor.</string>
-    <plurals name="sk_posts_count_label">
-        <item quantity="one">publicação</item>
-        <item quantity="many">publicações</item>
-        <item quantity="other">publicações</item>
-    </plurals>
 </resources>

mastodon/src/main/res/values/strings_sk.xml

@@ -404,8 +404,6 @@
 		<item quantity="one">%d day</item>
 		<item quantity="other">%d days</item>
 	</plurals>
-	<string name="sk_muted_account">Muted accounts</string>
-	<string name="sk_mutes">Mutes</string>
-	<string name="sk_blocked_account">Blocked accounts</string>
-	<string name="sk_blocks">Blocks</string>
+	<string name="sk_muted_accounts">Muted accounts</string>
+	<string name="sk_blocked_accounts">Blocked accounts</string>
 </resources>