From 3582d7bdad009c19c4196fd4637a8dfaaa5dc6bf Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Thu, 31 Oct 2024 09:24:26 +0300
Subject: [PATCH] Fix colors in high-contrast modes

---
 .../ui/viewcontrollers/ComposePollViewController.java    | 2 --
 .../android/ui/views/CheckIconSelectableTextView.java    | 2 +-
 .../main/res/color/bg_compose_poll_style_inactive.xml    | 4 ++++
 mastodon/src/main/res/drawable/poll_multiple.xml         | 2 +-
 mastodon/src/main/res/drawable/poll_single.xml           | 2 +-
 mastodon/src/main/res/values/attrs.xml                   | 2 ++
 mastodon/src/main/res/values/styles.xml                  | 9 +++++++++
 7 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 mastodon/src/main/res/color/bg_compose_poll_style_inactive.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
index 701cee34..fb0ca493 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
@@ -9,12 +9,10 @@ import android.graphics.RectF;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.VibrationEffect;
-import android.os.Vibrator;
 import android.view.HapticFeedbackConstants;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Checkable;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/CheckIconSelectableTextView.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/CheckIconSelectableTextView.java
index 7eff03bc..bd40ea53 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/views/CheckIconSelectableTextView.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/CheckIconSelectableTextView.java
@@ -36,7 +36,7 @@ public class CheckIconSelectableTextView extends TextView{
 		currentlySelected=isSelected();
 		Drawable start=currentlySelected ? getResources().getDrawable(R.drawable.ic_baseline_check_18, getContext().getTheme()).mutate() : null;
 		if(start!=null)
-			start.setTint(UiUtils.getThemeColor(getContext(), getCheckmarkColorAttribute()));
+			start.setTintList(getTextColors());
 		Drawable end=getCompoundDrawablesRelative()[2];
 		setCompoundDrawablesRelativeWithIntrinsicBounds(start, null, end, null);
 	}
diff --git a/mastodon/src/main/res/color/bg_compose_poll_style_inactive.xml b/mastodon/src/main/res/color/bg_compose_poll_style_inactive.xml
new file mode 100644
index 00000000..3b4301e7
--- /dev/null
+++ b/mastodon/src/main/res/color/bg_compose_poll_style_inactive.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="?colorM3PrimaryContainer" android:alpha="?composePollStyleInactiveAlpha"/>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/poll_multiple.xml b/mastodon/src/main/res/drawable/poll_multiple.xml
index f7eb513d..339d1702 100644
--- a/mastodon/src/main/res/drawable/poll_multiple.xml
+++ b/mastodon/src/main/res/drawable/poll_multiple.xml
@@ -33,7 +33,7 @@
 		<layer-list>
 			<item>
 				<shape android:shape="oval">
-					<solid android:color="?colorM3PrimaryContainer"/>
+					<solid android:color="@color/bg_compose_poll_style_inactive"/>
 				</shape>
 			</item>
 			<item>
diff --git a/mastodon/src/main/res/drawable/poll_single.xml b/mastodon/src/main/res/drawable/poll_single.xml
index 1037aa70..4c566010 100644
--- a/mastodon/src/main/res/drawable/poll_single.xml
+++ b/mastodon/src/main/res/drawable/poll_single.xml
@@ -40,7 +40,7 @@
 		<layer-list>
 			<item>
 				<shape android:shape="oval">
-					<solid android:color="?colorM3PrimaryContainer"/>
+					<solid android:color="@color/bg_compose_poll_style_inactive"/>
 				</shape>
 			</item>
 			<item>
diff --git a/mastodon/src/main/res/values/attrs.xml b/mastodon/src/main/res/values/attrs.xml
index 7b644883..2df5c1a8 100644
--- a/mastodon/src/main/res/values/attrs.xml
+++ b/mastodon/src/main/res/values/attrs.xml
@@ -47,6 +47,8 @@
 	<attr name="colorRichTextContainer" format="color"/>
 	<attr name="colorRichTextDecorations" format="color"/>
 
+	<attr name="composePollStyleInactiveAlpha" format="float"/>
+
 	<declare-styleable name="MaxWidthFrameLayout">
 		<attr name="android:maxWidth" format="dimension"/>
 	</declare-styleable>
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index a2dafdfc..b27183f0 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -82,6 +82,7 @@
 		<item name="android:textColorPrimary">?colorM3OnSurface</item>
 		<item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item>
 		<item name="android:textAppearanceLargePopupMenu">@style/popup_menu_item_text</item>
+		<item name="composePollStyleInactiveAlpha">1</item>
 	</style>
 
 	<style name="Theme.Mastodon.Dark" parent="Theme.AppKit">
@@ -105,6 +106,7 @@
 		<item name="android:switchStyle">@style/Widget.Mastodon.M3.Switch</item>
 		<item name="android:windowActionModeOverlay">true</item>
 		<item name="android:actionModeBackground">@color/m3_sys_dark_primary</item>
+		<item name="android:actionModeStyle">@style/Widget.Mastodon.Toolbar.ActionMode</item>
 		<item name="android:actionModeCloseDrawable">@drawable/ic_actionmode_close</item>
 		<item name="appkitEmptyTextAppearance">@style/empty_text</item>
 
@@ -165,6 +167,7 @@
 		<item name="android:textColorPrimary">?colorM3OnSurface</item>
 		<item name="android:textColorSecondary">?colorM3OnSurfaceVariant</item>
 		<item name="android:textAppearanceLargePopupMenu">@style/popup_menu_item_text</item>
+		<item name="composePollStyleInactiveAlpha">1</item>
 	</style>
 
 	<style name="Theme.Mastodon.Light.MediumContrast">
@@ -183,6 +186,8 @@
 		<item name="colorRichTextText">@color/ext_rich_text_text_light_medium_contrast</item>
 		<item name="colorRichTextContainer">@color/ext_rich_text_container_light_medium_contrast</item>
 		<item name="colorRichTextDecorations">@color/ext_rich_text_decoration_light_medium_contrast</item>
+
+		<item name="composePollStyleInactiveAlpha">0.6</item>
 	</style>
 
 	<style name="Theme.Mastodon.Light.HighContrast">
@@ -201,12 +206,16 @@
 		<item name="colorRichTextText">@color/ext_rich_text_text_light_high_contrast</item>
 		<item name="colorRichTextContainer">@color/ext_rich_text_container_light_high_contrast</item>
 		<item name="colorRichTextDecorations">@color/ext_rich_text_decoration_light_high_contrast</item>
+
+		<item name="composePollStyleInactiveAlpha">0.6</item>
 	</style>
 
 	<style name="Theme.Mastodon.Dark.MediumContrast">
+		<item name="composePollStyleInactiveAlpha">0.6</item>
 	</style>
 
 	<style name="Theme.Mastodon.Dark.HighContrast">
+		<item name="composePollStyleInactiveAlpha">0.6</item>
 	</style>
 
 	<style name="Theme.Mastodon.Dark.SplashFragment">