fix schedule date picker not time zone safe

closes sk22#940

mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java

@@ -39,7 +39,6 @@ public class GlobalUserPreferences{
 	public static boolean showNewPostsButton;
 	public static boolean toolbarMarquee;
 	public static boolean disableSwipe;
-	public static boolean voteButtonForSingleChoice;
 	public static boolean enableDeleteNotifications;
 	public static boolean translateButtonOpenedOnly;
 	public static boolean uniformNotificationIcon;
@@ -99,7 +98,6 @@ public class GlobalUserPreferences{
 		showNewPostsButton=prefs.getBoolean("showNewPostsButton", true);
 		toolbarMarquee=prefs.getBoolean("toolbarMarquee", true);
 		disableSwipe=prefs.getBoolean("disableSwipe", false);
-		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
 		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", false);
 		translateButtonOpenedOnly=prefs.getBoolean("translateButtonOpenedOnly", false);
 		uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", false);

mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java

@@ -516,7 +516,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	public void onPollOptionClick(PollOptionStatusDisplayItem.Holder holder){
 		Poll poll=holder.getItem().poll;
 		Poll.Option option=holder.getItem().option;
-		if(poll.multiple || GlobalUserPreferences.voteButtonForSingleChoice){
+		// MEGALODON: always show vote button
+//		if(poll.multiple){
 			if(poll.selectedOptions==null)
 				poll.selectedOptions=new ArrayList<>();
 			boolean optionContained=poll.selectedOptions.contains(option);
@@ -531,7 +532,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			for(int i=0;i<list.getChildCount();i++){
 				RecyclerView.ViewHolder vh=list.getChildViewHolder(list.getChildAt(i));
 				if(!poll.multiple && vh instanceof PollOptionStatusDisplayItem.Holder item){
-					if (item != holder) item.itemView.setSelected(false);
+					if(item!=holder) item.itemView.setSelected(false);
 				}
 				if(vh instanceof PollFooterStatusDisplayItem.Holder footer){
 					if(footer.getItemID().equals(holder.getItemID())){
@@ -540,9 +541,9 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 					}
 				}
 			}
-		}else{
-			submitPollVote(holder.getItemID(), poll.id, Collections.singletonList(poll.options.indexOf(option)));
-		}
+//		}else{
+//			submitPollVote(holder.getItemID(), poll.id, Collections.singletonList(poll.options.indexOf(option)));
+//		}
 	}
 
 	public void onPollVoteButtonClick(PollFooterStatusDisplayItem.Holder holder){
@@ -550,6 +551,14 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		submitPollVote(holder.getItemID(), poll.id, poll.selectedOptions.stream().map(opt->poll.options.indexOf(opt)).collect(Collectors.toList()));
 	}
 
+	public void onPollViewResultsButtonClick(PollFooterStatusDisplayItem.Holder holder, boolean shown){
+			for(int i=0;i<list.getChildCount();i++){
+				if(list.getChildViewHolder(list.getChildAt(i)) instanceof PollOptionStatusDisplayItem.Holder item && item.getItemID().equals(holder.getItemID())){
+					item.showResults(shown);
+				}
+			}
+	}
+
 	protected void submitPollVote(String parentID, String pollID, List<Integer> choices){
 		if(refreshing)
 			return;

mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java

@@ -1437,8 +1437,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				.withMinute(0);
 		new DatePickerDialog(getActivity(), (datePicker, year, arrayMonth, dayOfMonth) -> {
 			new TimePickerDialog(getActivity(), (timePicker, hour, minute) -> {
-				updateScheduledAt(LocalDateTime.of(year, arrayMonth + 1, dayOfMonth, hour, minute)
-						.toInstant(OffsetDateTime.now().getOffset()));
+				LocalDateTime at=LocalDateTime.of(year, arrayMonth + 1, dayOfMonth, hour, minute);
+				updateScheduledAt(at.toInstant(ZoneId.systemDefault().getRules().getOffset(at)));
 			}, soon.getHour(), soon.getMinute(), DateFormat.is24HourFormat(getActivity())).show();
 		}, soon.getYear(), soon.getMonthValue() - 1, soon.getDayOfMonth()).show();
 	}

mastodon/src/main/java/org/joinmastodon/android/model/Card.java

@@ -2,6 +2,7 @@ package org.joinmastodon.android.model;
 
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -47,6 +48,13 @@ public class Card extends BaseModel{
 		}
 	}
 
+	public boolean isHashtagUrl(String statusUrl){
+		Uri parsedUrl=Uri.parse(url);
+		Uri parsedStatusUrl=Uri.parse(statusUrl);
+		if(parsedUrl.getHost()==null || parsedUrl.getPath()==null || parsedStatusUrl.getHost()==null) return false;
+		return title.equals("Akkoma") && parsedUrl.getHost().equals(parsedStatusUrl.getHost()) && parsedUrl.getPath().startsWith("/tag/");
+	}
+
 	@Override
 	public String toString(){
 		return "Card{"+

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

@@ -6,7 +6,6 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Poll;
@@ -14,6 +13,7 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 
 public class PollFooterStatusDisplayItem extends StatusDisplayItem{
 	public final Poll poll;
+	public boolean resultsVisible=false;
 
 	public PollFooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Poll poll){
 		super(parentID, parentFragment);
@@ -27,29 +27,40 @@ public class PollFooterStatusDisplayItem extends StatusDisplayItem{
 
 	public static class Holder extends StatusDisplayItem.Holder<PollFooterStatusDisplayItem>{
 		private TextView text;
-		private Button button;
+		private Button voteButton, resultsButton;
+		private ViewGroup wrapper;
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_poll_footer, parent);
 			text=findViewById(R.id.text);
-			button=findViewById(R.id.vote_btn);
-			button.setOnClickListener(v->item.parentFragment.onPollVoteButtonClick(this));
+			voteButton=findViewById(R.id.vote_btn);
+			voteButton.setOnClickListener(v->item.parentFragment.onPollVoteButtonClick(this));
+			resultsButton=findViewById(R.id.results_btn);
+			wrapper=findViewById(R.id.wrapper);
+			resultsButton.setOnClickListener(v-> {
+				item.resultsVisible = !item.resultsVisible;
+				item.parentFragment.onPollViewResultsButtonClick(this, item.resultsVisible);
+				rebind();
+				UiUtils.beginLayoutTransition(wrapper);
+			});
 		}
 
 		@Override
 		public void onBind(PollFooterStatusDisplayItem item){
 			String text=item.parentFragment.getResources().getQuantityString(R.plurals.x_votes, item.poll.votesCount, item.poll.votesCount);
-			String sep=item.parentFragment.getString(R.string.sk_separator);
-			if(item.poll.expiresAt!=null && !item.poll.isExpired()){
-				text+=" "+sep+" "+UiUtils.formatTimeLeft(itemView.getContext(), item.poll.expiresAt);
-				if(item.poll.multiple)
-					text+=" "+sep+" "+item.parentFragment.getString(R.string.poll_multiple_choice);
-			}else if(item.poll.isExpired()){
-				text+=" "+sep+" "+item.parentFragment.getString(R.string.poll_closed);
-			}
+			String sep=" "+item.parentFragment.getString(R.string.sk_separator)+" ";
+			if(item.poll.expiresAt!=null && !item.poll.isExpired())
+				text+=sep+UiUtils.formatTimeLeft(itemView.getContext(), item.poll.expiresAt).replaceAll(" ", " ");
+			else if(item.poll.isExpired())
+				text+=sep+item.parentFragment.getString(R.string.poll_closed).replaceAll(" ", " ");
+			if(item.poll.multiple)
+				text+=sep+item.parentFragment.getString(R.string.sk_poll_multiple_choice).replaceAll(" ", " ");
 			this.text.setText(text);
-			button.setVisibility(item.poll.isExpired() || item.poll.voted || (!item.poll.multiple && !GlobalUserPreferences.voteButtonForSingleChoice) ? View.GONE : View.VISIBLE);
-			button.setEnabled(item.poll.selectedOptions!=null && !item.poll.selectedOptions.isEmpty());
+			resultsButton.setVisibility(item.poll.isExpired() || item.poll.voted ? View.GONE : View.VISIBLE);
+			resultsButton.setText(item.resultsVisible ? R.string.sk_poll_hide_results : R.string.sk_poll_show_results);
+			resultsButton.setSelected(item.resultsVisible);
+			voteButton.setVisibility(item.poll.isExpired() || item.poll.voted ? View.GONE : View.VISIBLE);
+			voteButton.setEnabled(item.poll.selectedOptions!=null && !item.poll.selectedOptions.isEmpty() && !item.resultsVisible);
 		}
 	}
 }

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

@@ -17,6 +17,7 @@ import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
+import java.util.Collections;
 import java.util.Locale;
 
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
@@ -44,6 +45,10 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 		text=HtmlParser.parseCustomEmoji(option.title, poll.emojis);
 		emojiHelper.setText(text);
 		showResults=poll.isExpired() || poll.voted;
+		calculateResults();
+	}
+
+	private void calculateResults() {
 		int total=poll.votersCount>0 ? poll.votersCount : poll.votesCount;
 		if(showResults && option.votesCount!=null && total>0){
 			votesFraction=(float)option.votesCount/(float)total;
@@ -135,5 +140,11 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 		private void onButtonClick(View v){
 			item.parentFragment.onPollOptionClick(this);
 		}
+
+		public void showResults(boolean shown) {
+			item.showResults = shown;
+			item.calculateResults();
+			rebind();
+		}
 	}
 }

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

@@ -28,7 +28,6 @@ import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.DisplayItemsParent;
-import org.joinmastodon.android.model.FilterAction;
 import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.FilterResult;
@@ -293,7 +292,7 @@ public abstract class StatusDisplayItem{
 		if(statusForContent.poll!=null){
 			buildPollItems(parentID, fragment, statusForContent.poll, status, contentItems);
 		}
-		if(statusForContent.card!=null && statusForContent.mediaAttachments.isEmpty() && statusForContent.quote==null){
+		if(statusForContent.card!=null && statusForContent.mediaAttachments.isEmpty() && statusForContent.quote==null && !statusForContent.card.isHashtagUrl(statusForContent.url)){
 			contentItems.add(new LinkCardStatusDisplayItem(parentID, fragment, statusForContent));
 		}
 		if(statusForContent.quote!=null && !(parentObject instanceof Notification)){

mastodon/src/main/res/layout/display_item_poll_footer.xml

@@ -6,18 +6,38 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
-	<TextView
-		android:id="@+id/text"
+	<LinearLayout
+		android:id="@+id/wrapper"
+		android:orientation="horizontal"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="4dp"
-		android:layout_marginBottom="12dp"
-		android:paddingLeft="16dp"
-		android:paddingRight="16dp"
-		android:textAppearance="@style/m3_body_medium"
-		android:gravity="center_vertical"
-		android:textColor="?colorM3OnSurfaceVariant"
-		tools:text="fdsafdsafsdafds"/>
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/text"
+			android:layout_width="0dp"
+			android:layout_weight="1"
+			android:layout_height="wrap_content"
+			android:layout_marginVertical="6dp"
+			android:paddingLeft="16dp"
+			android:paddingRight="16dp"
+			android:textAppearance="@style/m3_body_medium"
+			android:layout_gravity="center_vertical"
+			android:textColor="?colorM3OnSurfaceVariant"
+			tools:text="fdsafdsafsdafds"/>
+
+		<Button
+			android:id="@+id/results_btn"
+			style="@style/Widget.Mastodon.M3.Button.Tonal"
+			android:background="@drawable/bg_button_m3_tonal_selector"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginEnd="16dp"
+			android:layout_marginVertical="4dp"
+			android:textAppearance="@style/m3_label_small"
+			android:text="@string/sk_poll_show_results"/>
+
+	</LinearLayout>
 
 	<Button
 		android:id="@+id/vote_btn"
@@ -25,7 +45,6 @@
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="16dp"
 		android:layout_marginBottom="4dp"
-		android:layout_marginTop="-4dp"
 		android:enabled="false"
 		style="@style/Widget.Mastodon.M3.Button.Filled.Elevated"
 		android:text="@string/action_vote"/>

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

@@ -86,7 +86,6 @@
     <string name="sk_color_palette_brown">قهوي</string>
     <string name="sk_color_palette_red">أحمر</string>
     <string name="sk_color_palette_yellow">أصفر</string>
-    <string name="sk_poll_allow_multiple">السماح بخيارات متعددة</string>
     <string name="sk_translate_post">ترجمة</string>
     <string name="sk_translate_show_original">إظهار الأصلي</string>
     <string name="sk_translated_using">تُرجِم بواسطة %s</string>

mastodon/src/main/res/values-ca-rES/strings_sk.xml

@@ -49,7 +49,6 @@
     <string name="sk_color_palette_yellow">Groc</string>
     <string name="sk_timeline_local">Local</string>
     <string name="sk_timeline_federated">Federació</string>
-    <string name="sk_poll_allow_multiple">Permet resposta múltiple</string>
     <string name="sk_translate_post">Tradueix</string>
     <string name="sk_example_domain">exemple.social</string>
     <string name="sk_welcome_title">Et donem la benvinguda!</string>

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

@@ -39,7 +39,6 @@
     <string name="sk_settings_color_palette">Palet lliwiau</string>
     <string name="sk_no_update_available">Dim diweddariad ar gael</string>
     <string name="sk_check_for_update">Gwirio am ddiweddariad</string>
-    <string name="sk_poll_allow_multiple">Caniatáu mwy nag un dewis</string>
     <string name="sk_language_name">%1$s (%2$s)</string>
     <string name="sk_settings_tabs_disable_swipe">Analluogi llusgo rhwng tabiau</string>
     <string name="sk_settings_posting">Dewisiadau postio</string>

mastodon/src/main/res/values-de-rDE/strings_sk.xml

@@ -47,7 +47,6 @@
     <string name="sk_color_palette_yellow">Gelb</string>
     <string name="sk_notification_type_status">Beiträge</string>
     <string name="sk_color_palette_blue">Blau</string>
-    <string name="sk_poll_allow_multiple">Mehrfachantworten erlauben</string>
     <string name="sk_translated_using">Übersetzt mit %s</string>
     <string name="sk_post_language">Sprache: %s</string>
     <string name="sk_language_name">%1$s (%2$s)</string>
@@ -434,4 +433,5 @@
     <string name="sk_open_post_preview">Vorschau öffnen</string>
     <string name="sk_post_preview">Vorschau</string>
     <string name="sk_private_note_confirm_delete">Private Notiz über %s löschen\?</string>
+	<string name="sk_poll_multiple_choice">Mehrfachauswahl</string>
 </resources>

mastodon/src/main/res/values-es-rES/strings_sk.xml

@@ -47,7 +47,6 @@
     <string name="sk_color_palette_blue">Azul</string>
     <string name="sk_color_palette_brown">Marrón</string>
     <string name="sk_color_palette_yellow">Amarillo</string>
-    <string name="sk_poll_allow_multiple">Permitir varias respuestas</string>
     <string name="sk_translate_post">Traducir</string>
     <string name="sk_translate_show_original">Mostrar original</string>
     <string name="sk_translated_using">Traducido mediante %s</string>

mastodon/src/main/res/values-eu-rES/strings_sk.xml

@@ -25,7 +25,6 @@
     <string name="sk_no_update_available">Ez dago eguneraketarik eskuragarri</string>
     <string name="sk_list_timelines">Zerrendak</string>
     <string name="sk_follow_requests">Jarraitzeko eskaerak</string>
-    <string name="sk_poll_allow_multiple">Onartu aukera anitzak</string>
     <string name="sk_clear_recent_languages">Ezabatu berriki erabili diren hizkuntzak</string>
     <string name="sk_welcome_title">Ongi etorri!</string>
     <string name="sk_example_domain">adibidea.eus</string>

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

@@ -65,7 +65,6 @@
     <string name="sk_settings_show_boosts">نمایش تقویت‌ها</string>
     <string name="sk_notification_type_update">فرسته‌های ویرایش شده</string>
     <string name="sk_update_ready">مگالودون %s بارگیری شده و آماده نصب است.</string>
-    <string name="sk_poll_allow_multiple">اجازه انتخاب های متعدد</string>
     <string name="sk_open_with_account">باز کردن با حساب دیگر</string>
     <string name="sk_confirm_delete_draft_title">حذف پیش نویس</string>
     <string name="sk_draft">پیش‌نویس</string>

mastodon/src/main/res/values-fi-rFI/strings_sk.xml

@@ -155,7 +155,6 @@
     <string name="sk_color_palette_brown">Ruskea</string>
     <string name="sk_color_palette_red">Punainen</string>
     <string name="sk_color_palette_yellow">Keltainen</string>
-    <string name="sk_poll_allow_multiple">Salli useita valintoja</string>
     <string name="sk_translate_post">Käännä</string>
     <string name="sk_welcome_text">Hai tervehtii sinua! Päästäksesi alkuun kirjoita koti-instanssisi osoite alla olevaan ruutuun.</string>
     <string name="sk_example_domain">example.social</string>

mastodon/src/main/res/values-fr-rFR/strings_sk.xml

@@ -47,7 +47,6 @@
     <string name="sk_color_palette_brown">Marron</string>
     <string name="sk_color_palette_yellow">Jaune</string>
     <string name="sk_settings_color_palette">Couleur d\'accentuation</string>
-    <string name="sk_poll_allow_multiple">Autoriser plusieurs choix</string>
     <string name="sk_translate_post">Traduire</string>
     <string name="sk_translate_show_original">Afficher l\'original</string>
     <string name="sk_translated_using">Traduit en utilisant %s</string>

mastodon/src/main/res/values-gd-rGB/strings_sk.xml

@@ -2,7 +2,6 @@
 <resources>
     <string name="sk_filtered">Criathraichte: %s</string>
     <string name="sk_collapse">Co-theannaich</string>
-    <string name="sk_poll_allow_multiple">Ceadaich iomadh roghainn</string>
     <string name="sk_pinned_posts">Prìnichte</string>
     <string name="sk_clear_recent_languages">Falamhaich na cànain o chionn goirid</string>
     <string name="sk_app_name">Megalodon</string>

mastodon/src/main/res/values-gl-rES/strings_sk.xml

@@ -36,7 +36,6 @@
     <string name="sk_reject_follow_request">Rexeitar solicitude de seguimento</string>
     <string name="sk_settings_always_reveal_content_warnings">Mostrar sempre o contido con avisos</string>
     <string name="sk_notification_type_status">Publicacións</string>
-    <string name="sk_poll_allow_multiple">Permitir selección múltiple</string>
     <string name="sk_translate_post">Traducir</string>
     <string name="sk_translate_show_original">Mostrar orixinal</string>
     <string name="sk_translated_using">Traducido empregando %s</string>

mastodon/src/main/res/values-hr-rHR/strings_sk.xml

@@ -6,7 +6,6 @@
     <string name="sk_timeline_home">Home</string>
     <string name="sk_timeline_local">Lokalno</string>
     <string name="sk_timeline_federated">Federacija</string>
-    <string name="sk_poll_allow_multiple">Omogući više izbora</string>
     <string name="sk_clear_recent_languages">Očisti listu nedavno korištenih jezika</string>
     <string name="sk_app_name">Megalodon</string>
     <string name="sk_pinned_posts">Prikvačeno</string>

mastodon/src/main/res/values-hu-rHU/strings_sk.xml

@@ -121,7 +121,6 @@
     <string name="sk_settings_show_boosts">Show boostok</string>
     <string name="sk_settings_show_interaction_counts">Interakciószámok megjelenítése</string>
     <string name="sk_reject_follow_request">Követési kérelem elutasítása</string>
-    <string name="sk_poll_allow_multiple">Több választási lehetőség engedélyezése</string>
     <string name="sk_settings_tabs_disable_swipe">Lapok közötti lapozás letiltása</string>
     <string name="sk_settings_about">Az alkalmazásról</string>
     <string name="sk_quoting_user">%s említése</string>

mastodon/src/main/res/values-in-rID/strings_sk.xml

@@ -47,7 +47,6 @@
     <string name="sk_color_palette_blue">Biru</string>
     <string name="sk_color_palette_brown">Cokelat</string>
     <string name="sk_color_palette_yellow">Kuning</string>
-    <string name="sk_poll_allow_multiple">Perbolehkan beberapa pilihan</string>
     <string name="sk_clear_recent_languages">Hapus bahasa terkini yang digunakan</string>
     <string name="sk_welcome_title">Selamat datang!</string>
     <string name="sk_confirm_clear_recent_languages">Apakah Anda yakin ingin menghapus bahasa terkini yang Anda gunakan\?</string>

mastodon/src/main/res/values-it-rIT/strings_sk.xml

@@ -56,7 +56,6 @@
     <string name="sk_clear_recent_languages">Cancella le lingue usate di recente</string>
     <string name="sk_welcome_title">Benvenuto!</string>
     <string name="sk_example_domain">example.social</string>
-    <string name="sk_poll_allow_multiple">Consenti scelte multiple</string>
     <string name="sk_available_languages">Lingue disponibili</string>
     <string name="sk_welcome_text">Lo squalo ti saluta! Per iniziare inserisci qui sotto l\'indirizzo dell\'istanza a cui sei iscritto.</string>
     <string name="sk_color_palette_material3">Sistema</string>

mastodon/src/main/res/values-ja-rJP/strings_sk.xml

@@ -34,7 +34,6 @@
     <string name="sk_timeline_home">ホーム</string>
     <string name="sk_translate_post">翻訳</string>
     <string name="sk_translate_show_original">オリジナルを表示</string>
-    <string name="sk_poll_allow_multiple">複数回答を許可</string>
     <string name="sk_clear_recent_languages">最近使用した言語を消去</string>
     <string name="sk_settings_show_boosts">ブーストを表示</string>
     <string name="sk_app_name">Megalodon</string>

mastodon/src/main/res/values-ko-rKR/strings_sk.xml

@@ -47,7 +47,6 @@
     <string name="sk_color_palette_brown">갈색</string>
     <string name="sk_color_palette_yellow">노란색</string>
     <string name="sk_settings_contribute">Megalodon에 기여</string>
-    <string name="sk_poll_allow_multiple">다중 선택 허용</string>
     <string name="sk_translate_post">번역하기</string>
     <string name="sk_translate_show_original">원본 보기</string>
     <string name="sk_post_language">언어: %s</string>

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

@@ -31,7 +31,6 @@
     <string name="sk_federated_timeline_info_banner">သင့်ဖက်ဒရေးရှင်းကလူတွေရဲ့ လတ်တလောပို့စ်တွေ ဖြစ်ပါတယ်။</string>
     <string name="sk_check_for_update">အပ်ဒိတ်ရှိလားစစ်ဆေးမည်</string>
     <string name="sk_settings_enable_marquee">ခေါင်းစီးဘားများတွင် စာများရွေ့လျားမှု ပိတ်မည်</string>
-    <string name="sk_poll_allow_multiple">တစ်ခုထက်ပိုသောရွေးချယ်မှုများကို ခွင့်ပြုမည်</string>
     <string name="sk_clear_recent_languages">လတ်တလောသုံးထားသည့် ဘာသာစကားများကို ရှင်းလင်းမည်</string>
     <string name="sk_welcome_title">မင်္ဂလာပါ</string>
     <string name="sk_pinned_posts">ပင်တွဲထားသည်များ</string>

mastodon/src/main/res/values-nl-rNL/strings_sk.xml

@@ -45,7 +45,6 @@
     <string name="sk_timeline_home">Home</string>
     <string name="sk_timeline_federated">Federatie</string>
     <string name="sk_translate_post">Vertaal</string>
-    <string name="sk_poll_allow_multiple">Meerdere keuzes toestaan</string>
     <string name="sk_clear_recent_languages">Wis recent gebruikte talen</string>
     <string name="sk_welcome_text">De haai groet je! Graag je instance naam (Mastodon server) hieronder invullen om te beginnen.</string>
     <string name="sk_welcome_title">Welkom!</string>

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

@@ -60,7 +60,6 @@
     <string name="sk_color_palette_brown">Brun</string>
     <string name="sk_color_palette_red">Raud</string>
     <string name="sk_color_palette_yellow">Gul</string>
-    <string name="sk_poll_allow_multiple">Tillat fleire val</string>
     <string name="sk_confirm_delete_and_redraft">Er du sikker på at du vil slette og skrive dette innlegget på nytt\?</string>
     <string name="sk_confirm_unpin_post_title">Løys innlegg frå profil</string>
     <string name="sk_image_description">Bildeforklaring</string>

mastodon/src/main/res/values-pl-rPL/strings_sk.xml

@@ -47,7 +47,6 @@
     <string name="sk_color_palette_blue">Niebieski</string>
     <string name="sk_color_palette_brown">Brązowy</string>
     <string name="sk_color_palette_yellow">Żółty</string>
-    <string name="sk_poll_allow_multiple">Pozwalaj na wybieranie wielu opcji</string>
     <string name="sk_translate_post">Przetłumacz</string>
     <string name="sk_translate_show_original">Pokaż oryginał</string>
     <string name="sk_translated_using">Przetłumaczono przy użyciu %s</string>

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

@@ -55,7 +55,6 @@
     <string name="sk_confirm_clear_recent_languages">Você tem certeza que deseja limpar os idiomas usados recentemente\?</string>
     <string name="sk_clear_recent_languages">Limpar idiomas usados recentemente</string>
     <string name="sk_notification_type_posts">Notificações de publicações</string>
-    <string name="sk_poll_allow_multiple">Permitir múltiplas escolhas</string>
     <string name="sk_welcome_text">O tubarão te cumprimenta! Para começar, por favor, digite abaixo o nome de domínio de sua instância de origem.</string>
     <string name="sk_example_domain">exemplo.social</string>
     <string name="sk_welcome_title">Bem vindo!</string>

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

@@ -138,7 +138,6 @@
     <string name="sk_reject_follow_request">Rejeitar pedido para seguir</string>
     <string name="sk_lists_with_user">Listas com %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Mostrar sempre avisos de conteúdo</string>
-    <string name="sk_poll_allow_multiple">Permitir escolhas múltiplas</string>
     <string name="sk_translated_using">Traduzido por %s</string>
     <string name="sk_clear_recent_languages">Apagar idiomas usados recentemente</string>
     <string name="sk_confirm_clear_recent_languages">De certeza que quer apagar os seus idiomas usados recentemente\?</string>

mastodon/src/main/res/values-ro-rRO/strings_sk.xml

@@ -9,7 +9,6 @@
     <string name="sk_timeline_local">Local</string>
     <string name="sk_timeline_posts">Postări</string>
     <string name="sk_list">Listă</string>
-    <string name="sk_poll_allow_multiple">Permiteți alegeri multiple</string>
     <string name="sk_translate_post">Traduceți</string>
     <string name="sk_translate_show_original">Afișați originalul</string>
     <string name="sk_translated_using">Tradus folosind %s</string>

mastodon/src/main/res/values-ru-rRU/strings_sk.xml

@@ -53,7 +53,6 @@
     <string name="sk_clear_recent_languages">Очистить недавно использованные языки</string>
     <string name="sk_confirm_clear_recent_languages">Вы точно хотите очистить недавно использованные языки\?</string>
     <string name="sk_welcome_text">Акула приветствует вас! Чтобы начать, пожалуйста, введите домен своего домашнего сервера (инстанса) ниже.</string>
-    <string name="sk_poll_allow_multiple">Разрешить несколько вариантов ответа</string>
     <string name="sk_user_post_notifications_on">Включены уведомления о постах для %s</string>
     <string name="sk_user_post_notifications_off">Выключены уведомления о постах для %s</string>
     <string name="sk_color_palette_material3">Система</string>

mastodon/src/main/res/values-sl-rSI/strings_sk.xml

@@ -50,7 +50,6 @@
     <string name="sk_settings_contribute">Prispevajte k Megalodonu</string>
     <string name="sk_notification_type_status">Objave</string>
     <string name="sk_settings_color_palette">Barvna paleta</string>
-    <string name="sk_poll_allow_multiple">Dovoli več izbir</string>
     <string name="sk_translate_show_original">Pokaži izvirnik</string>
     <string name="sk_language_name">%1$s (%2$s)</string>
     <string name="sk_welcome_title">Dobrodošli!</string>

mastodon/src/main/res/values-sv-rSE/strings_sk.xml

@@ -48,7 +48,6 @@
     <string name="sk_duration_days_7">7 dagar</string>
     <string name="sk_timeline_local">Lokal</string>
     <string name="sk_timeline_federated">Federation</string>
-    <string name="sk_poll_allow_multiple">Tillåt flera val</string>
     <string name="sk_translate_post">Översätt</string>
     <string name="sk_available_languages">Tillgängliga språk</string>
     <string name="sk_confirm_clear_recent_languages">Är du säker på att du vill rensa dina nyligen använda språk\?</string>

mastodon/src/main/res/values-th-rTH/strings_sk.xml

@@ -13,7 +13,6 @@
     <string name="sk_pinned_posts">ปักหมุด</string>
     <string name="sk_confirm_delete_and_redraft">คุณแน่ใจหรือไม่ว่าต้องการลบและร่างโพสต์นี้ใหม่\?</string>
     <string name="sk_confirm_pin_post">คุณต้องการปักหมุดโพสต์นี้ไปยังโปรไฟล์ของคุณหรือไม่\?</string>
-    <string name="sk_poll_allow_multiple">อนุญาตหลายตัวเลือก</string>
     <string name="sk_clear_recent_languages">ล้างภาษาที่ใช้ล่าสุด</string>
     <string name="sk_welcome_title">ยินดีต้อนรับ!</string>
     <string name="sk_app_name">Megalodon</string>

mastodon/src/main/res/values-uk-rUA/strings_sk.xml

@@ -7,7 +7,6 @@
     <string name="sk_color_palette_blue">Синя</string>
     <string name="sk_color_palette_brown">Коричнева</string>
     <string name="sk_color_palette_yellow">Жовта</string>
-    <string name="sk_poll_allow_multiple">Дозволити кілька виборів</string>
     <string name="sk_translate_post">Перекласти</string>
     <string name="sk_translate_show_original">Показати оригінал</string>
     <string name="sk_translated_using">Перекладено за допомогою %s</string>

mastodon/src/main/res/values-vi-rVN/strings_sk.xml

@@ -2,7 +2,6 @@
 <resources>
     <string name="sk_filtered">Lọc: %s</string>
     <string name="sk_expand">Mở rộng</string>
-    <string name="sk_poll_allow_multiple">Cho phép chọn nhiều đáp án</string>
     <string name="sk_pinned_posts">Bài đăng đã ghim</string>
     <string name="sk_confirm_delete_and_redraft">Bạn có chắc muốn xóa và soạn lại bài đăng\?</string>
     <string name="sk_pin_post">Ghim vào hồ sơ</string>

mastodon/src/main/res/values-zh-rCN/strings_sk.xml

@@ -49,7 +49,6 @@
     <string name="sk_notification_type_posts">嘟文通知</string>
     <string name="sk_translate_post">翻译</string>
     <string name="sk_translate_show_original">显示原文</string>
-    <string name="sk_poll_allow_multiple">允许多选</string>
     <string name="sk_welcome_text">鲨鱼向你致敬！首先，请在下方输入你所在主实例的域名。</string>
     <string name="sk_welcome_title">欢迎！</string>
     <string name="sk_clear_recent_languages">清除最近使用的语言</string>

mastodon/src/main/res/values-zh-rTW/strings_sk.xml

@@ -2,7 +2,6 @@
 <resources>
     <string name="sk_notification_type_status">鋪文</string>
     <string name="sk_notification_type_posts">嘟文通知</string>
-    <string name="sk_poll_allow_multiple">允許複選</string>
     <string name="sk_translate_post">翻譯</string>
     <string name="sk_translated_using">通過 %s 翻譯</string>
     <string name="sk_post_language">語言: %s</string>

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

@@ -60,7 +60,6 @@
     <string name="sk_color_palette_brown">Brown</string>
     <string name="sk_color_palette_red">Red</string>
     <string name="sk_color_palette_yellow">Yellow</string>
-    <string name="sk_poll_allow_multiple">Allow multiple choices</string>
     <string name="sk_translate_post">Translate</string>
     <string name="sk_translate_show_original">Show original</string>
     <string name="sk_translated_using">Translated using %s</string>
@@ -435,4 +434,7 @@
 	<string name="sk_crash_log_copied">Crash log copied</string>
 	<string name="sk_open_post_preview">Preview post</string>
 	<string name="sk_post_preview">Preview</string>
+	<string name="sk_poll_multiple_choice">Multiple choices</string>
+	<string name="sk_poll_show_results">Show results</string>
+	<string name="sk_poll_hide_results">Hide results</string>
 </resources>

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

@@ -318,7 +318,7 @@
 		<item name="android:showText">false</item>
 	</style>
 
-	<style name="alert_title">
+	<style name="alert_title" parent="android:TextAppearance.DeviceDefault">
 		<item name="android:textSize">24sp</item>
 		<item name="android:minHeight">38dp</item>
 		<item name="android:gravity">center_vertical</item>
@@ -327,45 +327,45 @@
 		<item name="android:textColor">?colorM3OnSurface</item>
 	</style>
 
-	<style name="sheet_title">
+	<style name="sheet_title" parent="android:TextAppearance.DeviceDefault">
 		<item name="android:textSize">20sp</item>
 		<item name="android:gravity">center_vertical</item>
 	</style>
 
-	<style name="m3_body_large">
+	<style name="m3_body_large" parent="android:TextAppearance.DeviceDefault">
 		<item name="android:textSize">16sp</item>
-		<item name="android:lineSpacingExtra">5dp</item>
+		<item name="android:lineSpacingExtra">5sp</item>
 		<item name="android:lineHeight" tools:ignore="NewApi">24dp</item>
 	</style>
 
-	<style name="m3_body_medium">
+	<style name="m3_body_medium" parent="android:TextAppearance.DeviceDefault">
 		<item name="android:textSize">14sp</item>
-		<item name="android:lineSpacingExtra">4dp</item>
+		<item name="android:lineSpacingExtra">4sp</item>
 	</style>
 
-	<style name="m3_body_small">
+	<style name="m3_body_small" parent="android:TextAppearance.DeviceDefault">
 		<item name="android:textSize">12sp</item>
-		<item name="android:lineSpacingExtra">2dp</item>
+		<item name="android:lineSpacingExtra">2sp</item>
 	</style>
 
-	<style name="m3_title_medium">
+	<style name="m3_title_medium" parent="android:TextAppearance.DeviceDefault">
 		<item name="android:fontFamily">sans-serif-medium</item>
 		<item name="android:textSize">16sp</item>
-		<item name="android:lineSpacingExtra">5dp</item>
+		<item name="android:lineSpacingExtra">5sp</item>
 	</style>
 
-	<style name="m3_title_small">
+	<style name="m3_title_small" parent="android:TextAppearance.DeviceDefault">
 		<item name="android:fontFamily">sans-serif-medium</item>
 		<item name="android:textSize">14sp</item>
 	</style>
 
-	<style name="m3_label_small">
+	<style name="m3_label_small" parent="android:TextAppearance.DeviceDefault">
 		<item name="android:fontFamily">sans-serif-medium</item>
 		<item name="android:textSize">11sp</item>
-		<item name="android:lineSpacingExtra">3dp</item>
+		<item name="android:lineSpacingExtra">3sp</item>
 	</style>
 
-	<style name="m3_label_medium">
+	<style name="m3_label_medium" parent="android:TextAppearance.DeviceDefault">
 		<item name="android:fontFamily">sans-serif-medium</item>
 		<item name="android:textSize">12sp</item>
 		<item name="android:lineSpacingMultiplier">1.14</item>
@@ -374,12 +374,12 @@
 		<item name="android:lineHeight" tools:ignore="NewApi">16dp</item>
 	</style>
 
-	<style name="m3_label_large">
+	<style name="m3_label_large" parent="android:TextAppearance.DeviceDefault">
 		<item name="android:fontFamily">sans-serif-medium</item>
 		<item name="android:textSize">14sp</item>
 	</style>
 
-	<style name="m3_title_large">
+	<style name="m3_title_large" parent="android:TextAppearance.DeviceDefault">
 		<item name="android:fontFamily">sans-serif-medium</item>
 		<item name="android:textSize">22sp</item>
 	</style>
@@ -403,7 +403,7 @@
 
 	<style name="m3_headline_medium">
 		<item name="android:textSize">28sp</item>
-		<item name="android:lineSpacingExtra">3dp</item>
+		<item name="android:lineSpacingExtra">3sp</item>
 	</style>
 
 	<style name="window_fade_out">