From 7f639e3652c9a1a87f82cb3d5b65591e536fc071 Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Wed, 1 Jan 2025 13:11:48 +0100
Subject: [PATCH] Messaging: Use MaterialComponents everywhere instead of
 AppCompat

* This is the proper thing to do
* Also fixes crash when forwarding a message

Change-Id: Ib3f34477cc9b76b1979f9e6f2f39e0f9222c16ee
---
 res/layout/blocked_participants_activity.xml | 3 ++-
 res/layout/conversation_list_activity.xml    | 3 ++-
 res/layout/people_and_options_activity.xml   | 3 ++-
 res/layout/vcard_detail_activity.xml         | 3 ++-
 res/values/styles.xml                        | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/res/layout/blocked_participants_activity.xml b/res/layout/blocked_participants_activity.xml
index e00f20f..e39d92a 100644
--- a/res/layout/blocked_participants_activity.xml
+++ b/res/layout/blocked_participants_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
+    Copyright (C) 2025 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,6 +19,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     class="com.android.messaging.ui.BlockedParticipantsFragment"
     android:id="@+id/blocked_participants_fragment"
-    android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+    android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar"
     android:layout_width="fill_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
index 48f3b15..0b47e71 100644
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
+    Copyright (C) 2025 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,6 +19,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     class="com.android.messaging.ui.conversationlist.ConversationListFragment"
     android:id="@+id/conversation_list_fragment"
-    android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+    android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/res/layout/people_and_options_activity.xml b/res/layout/people_and_options_activity.xml
index af879a0..0296b86 100644
--- a/res/layout/people_and_options_activity.xml
+++ b/res/layout/people_and_options_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
+    Copyright (C) 2025 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,6 +19,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     class="com.android.messaging.ui.conversationsettings.PeopleAndOptionsFragment"
     android:id="@+id/people_and_options_fragment"
-    android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+    android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/res/layout/vcard_detail_activity.xml b/res/layout/vcard_detail_activity.xml
index aa4c3b9..de45a9d 100644
--- a/res/layout/vcard_detail_activity.xml
+++ b/res/layout/vcard_detail_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
+    Copyright (C) 2025 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,6 +19,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     class="com.android.messaging.ui.VCardDetailFragment"
     android:id="@+id/vcard_detail_fragment"
-    android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+    android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 772d307..f68f30d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
-    Copyright (C) 2024 The LineageOS Project
+    Copyright (C) 2024-2025 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@
         <item name="android:fastScrollPreviewBackgroundRight">@drawable/contacts_fastscroll_label_right</item>
     </style>
 
-    <style name="BugleTheme.DialogActivity" parent="@style/Theme.AppCompat.DayNight.Dialog">
+    <style name="BugleTheme.DialogActivity" parent="@style/Theme.MaterialComponents.DayNight.Dialog">
         <item name="android:windowNoTitle">false</item>
         <item name="android:background">@color/window_background</item>
         <item name="android:dialogCornerRadius">28dp</item>