From 3e256d41d27f69586c227e052ac83fc9589cf00b Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Thu, 11 Apr 2024 22:36:55 +0300
Subject: [PATCH] Fix alert text size

---
 .../android/ui/M3AlertDialogBuilder.java         |  5 +++++
 mastodon/src/main/res/layout/alert_title.xml     | 16 ++++++++++++++++
 mastodon/src/main/res/values/styles.xml          |  3 ---
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 mastodon/src/main/res/layout/alert_title.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java b/mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
index 7c54c920f..18def132e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
@@ -50,6 +50,11 @@ public class M3AlertDialogBuilder extends AlertDialog.Builder{
 				helpButton.setSelected(helpText.getVisibility()==View.VISIBLE);
 			});
 			setCustomTitle(titleLayout);
+		}else if(!TextUtils.isEmpty(title)){
+			View titleLayout=getContext().getSystemService(LayoutInflater.class).inflate(R.layout.alert_title, null);
+			TextView title=titleLayout.findViewById(R.id.title);
+			title.setText(this.title);
+			setCustomTitle(titleLayout);
 		}
 
 		alert=super.create();
diff --git a/mastodon/src/main/res/layout/alert_title.xml b/mastodon/src/main/res/layout/alert_title.xml
new file mode 100644
index 000000000..eb1a78b4e
--- /dev/null
+++ b/mastodon/src/main/res/layout/alert_title.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:padding="24dp">
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		style="?android:windowTitleStyle"
+		tools:text="Title"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 8f26478fe..98b54c114 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -215,8 +215,6 @@
 
 	<style name="Theme.Mastodon.Dialog.Alert" parent="android:Theme.Material.Light.Dialog.Alert">
 		<item name="android:windowTitleStyle">@style/alert_title</item>
-		<!-- it's unfortunate that https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/core/java/com/android/internal/widget/DialogTitle.java exists -->
-		<item name="android:textAppearanceMedium">@style/alert_title</item>
 		<item name="android:dialogPreferredPadding">24dp</item>
 		<item name="android:windowBackground">@drawable/bg_alert</item>
 		<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
@@ -231,7 +229,6 @@
 
 	<style name="Theme.Mastodon.Dialog.Alert.Dark" parent="android:Theme.Material.Dialog.Alert">
 		<item name="android:windowTitleStyle">@style/alert_title</item>
-		<item name="android:textAppearanceMedium">@style/alert_title</item>
 		<item name="android:dialogPreferredPadding">24dp</item>
 		<item name="android:windowBackground">@drawable/bg_alert</item>
 		<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>