show poll vote button for single choice polls

mastodon · Dec 5, 2022 · e14dfda · e14dfda
1 parent c9aae82
commit e14dfda
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -8,6 +8,7 @@ public class GlobalUserPreferences{
 	public static boolean useCustomTabs;
 	public static boolean trueBlackTheme;
 	public static ThemePreference theme;
+	public static boolean voteButtonForSingleChoice;
 
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
@@ -18,6 +19,7 @@ public static void load(){
 		playGifs=prefs.getBoolean("playGifs", true);
 		useCustomTabs=prefs.getBoolean("useCustomTabs", true);
 		trueBlackTheme=prefs.getBoolean("trueBlackTheme", false);
+		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 	}
 

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
@@ -19,6 +19,7 @@
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.polls.SubmitPollVote;
@@ -395,10 +396,12 @@ protected void updatePoll(String itemID, Status status, Poll poll){
 	public void onPollOptionClick(PollOptionStatusDisplayItem.Holder holder){
 		Poll poll=holder.getItem().poll;
 		Poll.Option option=holder.getItem().option;
-		if(poll.multiple){
+		if(poll.multiple || GlobalUserPreferences.voteButtonForSingleChoice){
 			if(poll.selectedOptions==null)
 				poll.selectedOptions=new ArrayList<>();
-			if(poll.selectedOptions.contains(option)){
+			boolean optionContained=poll.selectedOptions.contains(option);
+			if(!poll.multiple) poll.selectedOptions.clear();
+			if(optionContained){
 				poll.selectedOptions.remove(option);
 				holder.itemView.setSelected(false);
 			}else{
@@ -407,6 +410,9 @@ public void onPollOptionClick(PollOptionStatusDisplayItem.Holder holder){
 			}
 			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(vh instanceof PollFooterStatusDisplayItem.Holder footer){
 					if(footer.getItemID().equals(holder.getItemID())){
 						footer.rebind();

diff --git a/...n/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java b/...n/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java
@@ -6,6 +6,7 @@
 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;
@@ -44,7 +45,7 @@ public void onBind(PollFooterStatusDisplayItem item){
 				text+=" · "+item.parentFragment.getString(R.string.poll_closed);
 			}
 			this.text.setText(text);
-			button.setVisibility(item.poll.isExpired() || item.poll.voted || !item.poll.multiple ? View.GONE : View.VISIBLE);
+			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());
 		}
 	}