From 1bb613ed5ab40eea70e906248301db0308a19b7f Mon Sep 17 00:00:00 2001
From: Adam Kasprzycki <66315787+santoni0@users.noreply.github.com>
Date: Fri, 28 Oct 2022 22:32:00 +0200
Subject: [PATCH] Replace MaterialComponents with Material3

---
 .../edziennik/ext/DialogExtensions.kt         |  4 ++--
 .../dialogs/settings/ProfileConfigDialog.kt   |  2 +-
 .../ui/settings/SettingsLicenseActivity.kt    |  4 ++--
 .../res/layout/activity_build_invalid.xml     |  2 +-
 .../res/layout/attendance_details_dialog.xml  |  2 +-
 app/src/main/res/layout/card_home_archive.xml |  2 +-
 .../res/layout/card_home_availability.xml     |  4 ++--
 app/src/main/res/layout/card_home_debug.xml   | 19 +++++++++++++------
 app/src/main/res/layout/card_home_notes.xml   |  2 +-
 .../main/res/layout/card_home_timetable.xml   |  2 +-
 .../layout/dialog_bell_sync_time_choose.xml   |  2 +-
 .../main/res/layout/dialog_config_agenda.xml  |  2 +-
 .../main/res/layout/dialog_config_grades.xml  |  2 +-
 app/src/main/res/layout/dialog_day.xml        |  2 +-
 app/src/main/res/layout/dialog_edit_text.xml  |  2 +-
 .../main/res/layout/dialog_event_details.xml  | 12 ++++++------
 .../res/layout/dialog_event_manual_v2.xml     | 16 +++++++---------
 .../main/res/layout/dialog_grade_details.xml  |  4 ++--
 .../main/res/layout/dialog_lesson_details.xml |  6 +++---
 .../main/res/layout/dialog_profile_config.xml |  4 ++--
 .../layout/dialog_register_unavailable.xml    |  2 +-
 app/src/main/res/layout/event_list_item.xml   |  2 +-
 app/src/main/res/layout/fragment_debug.xml    | 10 +++++-----
 app/src/main/res/layout/fragment_feedback.xml |  8 ++++----
 app/src/main/res/layout/fragment_home.xml     |  2 +-
 .../main/res/layout/fragment_timetable_v2.xml |  5 ++---
 app/src/main/res/layout/grades_item_stats.xml |  2 +-
 app/src/main/res/layout/lab_fragment.xml      |  4 ++--
 .../res/layout/login_chooser_fragment.xml     |  4 ++--
 .../main/res/layout/login_form_field_item.xml |  2 +-
 .../main/res/layout/login_form_fragment.xml   |  2 +-
 .../main/res/layout/login_form_item_qr.xml    |  2 +-
 .../layout/login_platform_list_fragment.xml   |  6 +++---
 .../res/layout/login_summary_fragment.xml     |  2 +-
 app/src/main/res/layout/message_fragment.xml  | 10 +++++-----
 .../res/layout/messages_compose_fragment.xml  | 10 +++++-----
 .../res/layout/messages_config_dialog.xml     |  2 +-
 .../main/res/layout/note_editor_dialog.xml    |  6 +++---
 app/src/main/res/layout/note_list_item.xml    |  2 +-
 app/src/main/res/layout/search_item.xml       |  2 +-
 .../main/res/layout/styled_text_buttons.xml   | 14 +++++++-------
 .../main/res/layout/styled_text_dialog.xml    |  2 +-
 .../res/layout/template_page_fragment.xml     |  2 +-
 app/src/main/res/layout/web_push_fragment.xml |  2 +-
 app/src/main/res/values/styles.xml            |  4 ++--
 45 files changed, 104 insertions(+), 100 deletions(-)

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ext/DialogExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ext/DialogExtensions.kt
index 61de4f77..ede40393 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ext/DialogExtensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ext/DialogExtensions.kt
@@ -83,13 +83,13 @@ fun AlertDialog.overlayBackgroundColor(color: Int, alpha: Int) {
     val backgroundInsets = MaterialDialogs.getDialogBackgroundInsets(
         context,
         R.attr.alertDialogStyle,
-        R.style.MaterialAlertDialog_MaterialComponents,
+        R.style.MaterialAlertDialog_Material3,
     )
     val background = MaterialShapeDrawable(
         context,
         null,
         R.attr.alertDialogStyle,
-        R.style.MaterialAlertDialog_MaterialComponents
+        R.style.MaterialAlertDialog_Material3
     )
     with(background) {
         initializeElevationOverlay(context)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt
index 7ded038d..daeb5926 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt
@@ -46,7 +46,7 @@ class ProfileConfigDialog(
             activity,
             null,
             R.attr.alertDialogStyle,
-            R.style.MaterialAlertDialog_MaterialComponents
+            R.style.MaterialAlertDialog_Material3
         )
         val surface = MaterialColors.getColor(activity, R.attr.colorSurface, TAG)
         shape.setCornerSize(18.dp.toFloat())
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsLicenseActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsLicenseActivity.kt
index 5a4a5e9b..f86fe807 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsLicenseActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsLicenseActivity.kt
@@ -32,9 +32,9 @@ class SettingsLicenseActivity : MaterialAboutActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         setTheme(
             if (Themes.isDark)
-                R.style.Theme_MaterialComponents
+                R.style.Theme_Material3_Dark
             else
-                R.style.Theme_MaterialComponents_Light
+                R.style.Theme_Material3_Light
         )
         foregroundColor = if (Themes.isDark)
             R.color.primaryTextDark.resolveColor(this)
diff --git a/app/src/main/res/layout/activity_build_invalid.xml b/app/src/main/res/layout/activity_build_invalid.xml
index 0bc5fd85..1cf265ad 100644
--- a/app/src/main/res/layout/activity_build_invalid.xml
+++ b/app/src/main/res/layout/activity_build_invalid.xml
@@ -55,7 +55,7 @@
 
             <Button
                 android:id="@+id/closeButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
diff --git a/app/src/main/res/layout/attendance_details_dialog.xml b/app/src/main/res/layout/attendance_details_dialog.xml
index b3c46095..f2709920 100644
--- a/app/src/main/res/layout/attendance_details_dialog.xml
+++ b/app/src/main/res/layout/attendance_details_dialog.xml
@@ -241,7 +241,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/notesButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/card_home_archive.xml b/app/src/main/res/layout/card_home_archive.xml
index ffe979bc..d587ae65 100644
--- a/app/src/main/res/layout/card_home_archive.xml
+++ b/app/src/main/res/layout/card_home_archive.xml
@@ -40,7 +40,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/homeArchiveClose"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/home_archive_close" />
diff --git a/app/src/main/res/layout/card_home_availability.xml b/app/src/main/res/layout/card_home_availability.xml
index 9b4f67f5..45b5b52c 100644
--- a/app/src/main/res/layout/card_home_availability.xml
+++ b/app/src/main/res/layout/card_home_availability.xml
@@ -41,14 +41,14 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/homeAvailabilityUpdate"
-                style="@style/Widget.MaterialComponents.Button"
+                style="@style/Widget.Material3.Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/home_availability_update" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/homeAvailabilityInfo"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/home_availability_info" />
diff --git a/app/src/main/res/layout/card_home_debug.xml b/app/src/main/res/layout/card_home_debug.xml
index 4bcca808..70a05c44 100644
--- a/app/src/main/res/layout/card_home_debug.xml
+++ b/app/src/main/res/layout/card_home_debug.xml
@@ -20,14 +20,21 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/getLogs"
-            style="@style/Widget.MaterialComponents.Button"
+            style="@style/Widget.Material3.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Save Debug Logs" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/librusCaptchaButton"
+            style="@style/Widget.Material3.Button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="LIBRUS® Captcha" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/refreshWidget"
-            style="@style/Widget.MaterialComponents.Button"
+            style="@style/Widget.Material3.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Refresh all widgets" />
@@ -40,7 +47,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/runChucker"
-            style="@style/Widget.MaterialComponents.Button"
+            style="@style/Widget.Material3.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Launch Chucker" />
@@ -53,14 +60,14 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/migrate71"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Migration 71" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/syncReceivers"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Sync receivers" />
@@ -73,7 +80,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/pruneWorkButton"
-            style="@style/Widget.MaterialComponents.Button"
+            style="@style/Widget.Material3.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Prune finished work" />
diff --git a/app/src/main/res/layout/card_home_notes.xml b/app/src/main/res/layout/card_home_notes.xml
index da14da63..76d2a5cd 100644
--- a/app/src/main/res/layout/card_home_notes.xml
+++ b/app/src/main/res/layout/card_home_notes.xml
@@ -38,7 +38,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/addNote"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/notes_action_add" />
diff --git a/app/src/main/res/layout/card_home_timetable.xml b/app/src/main/res/layout/card_home_timetable.xml
index 9b210f7b..d07e4fc3 100644
--- a/app/src/main/res/layout/card_home_timetable.xml
+++ b/app/src/main/res/layout/card_home_timetable.xml
@@ -47,7 +47,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/noTimetableSync"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/home_timetable_no_timetable_sync" />
diff --git a/app/src/main/res/layout/dialog_bell_sync_time_choose.xml b/app/src/main/res/layout/dialog_bell_sync_time_choose.xml
index 0859f5a7..7474d56c 100644
--- a/app/src/main/res/layout/dialog_bell_sync_time_choose.xml
+++ b/app/src/main/res/layout/dialog_bell_sync_time_choose.xml
@@ -26,7 +26,7 @@
                 tools:text="@string/bell_sync_choose_howto" />
 
             <com.google.android.material.textfield.TextInputLayout
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense"
+                style="@style/Widget.Material3.TextInputLayout.FilledBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/bell_sync_time_title">
diff --git a/app/src/main/res/layout/dialog_config_agenda.xml b/app/src/main/res/layout/dialog_config_agenda.xml
index effe23fe..5adc8930 100644
--- a/app/src/main/res/layout/dialog_config_agenda.xml
+++ b/app/src/main/res/layout/dialog_config_agenda.xml
@@ -144,7 +144,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/elearningType"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:enabled="@{elearningEnabled.checked}"
diff --git a/app/src/main/res/layout/dialog_config_grades.xml b/app/src/main/res/layout/dialog_config_grades.xml
index 1e0e9058..c1ae35fb 100644
--- a/app/src/main/res/layout/dialog_config_grades.xml
+++ b/app/src/main/res/layout/dialog_config_grades.xml
@@ -91,7 +91,7 @@
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
                 android:hint="@string/grades_config_dont_count_hint"
                 app:placeholderText="@string/grades_config_dont_count_placeholder"
                 android:enabled="@{dontCountGrades.checked}">
diff --git a/app/src/main/res/layout/dialog_day.xml b/app/src/main/res/layout/dialog_day.xml
index 9fd14e1e..ede43ffb 100644
--- a/app/src/main/res/layout/dialog_day.xml
+++ b/app/src/main/res/layout/dialog_day.xml
@@ -121,7 +121,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/notesButton"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/dialog_edit_text.xml b/app/src/main/res/layout/dialog_edit_text.xml
index 6937705e..6b96fa0a 100644
--- a/app/src/main/res/layout/dialog_edit_text.xml
+++ b/app/src/main/res/layout/dialog_edit_text.xml
@@ -20,7 +20,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/text_input_layout"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/layout/dialog_event_details.xml b/app/src/main/res/layout/dialog_event_details.xml
index b954ce11..f44f289c 100644
--- a/app/src/main/res/layout/dialog_event_details.xml
+++ b/app/src/main/res/layout/dialog_event_details.xml
@@ -222,7 +222,7 @@
                 <!-- cmd_eye_check_outline -->
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/checkDoneButton"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
@@ -235,7 +235,7 @@
                 <!-- cmd_pencil_outline -->
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/editButton"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
@@ -247,7 +247,7 @@
                 <!-- cmd_calendar_export -->
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/saveInCalendarButton"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
@@ -259,7 +259,7 @@
                 <!-- cmd_cursor_default_click_outline -->
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/goToTimetableButton"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
@@ -271,7 +271,7 @@
                 <!-- cmd_download_outline -->
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/downloadButton"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
@@ -283,7 +283,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/notesButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/dialog_event_manual_v2.xml b/app/src/main/res/layout/dialog_event_manual_v2.xml
index 7d5bda4f..19dd2359 100644
--- a/app/src/main/res/layout/dialog_event_manual_v2.xml
+++ b/app/src/main/res/layout/dialog_event_manual_v2.xml
@@ -22,7 +22,7 @@
         android:padding="24dp">
 
         <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense"
+            style="@style/Widget.Material3.TextInputLayout.FilledBox.Dense"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/dialog_event_manual_date">
@@ -35,8 +35,7 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/timeDropdownLayout"
-            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense"
+            style="@style/Widget.Material3.TextInputLayout.FilledBox.Dense"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -52,7 +51,7 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -90,7 +89,7 @@
             android:orientation="horizontal">
 
             <com.google.android.material.textfield.TextInputLayout
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -121,7 +120,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/topicLayout"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -165,8 +164,7 @@
             tools:visibility="visible">
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/subjectDropdownLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -181,7 +179,7 @@
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/dialog_grade_details.xml b/app/src/main/res/layout/dialog_grade_details.xml
index a6d2caec..3fc4b8f8 100644
--- a/app/src/main/res/layout/dialog_grade_details.xml
+++ b/app/src/main/res/layout/dialog_grade_details.xml
@@ -309,7 +309,7 @@
 
                 <Button
                     android:id="@+id/customValueButton"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:minHeight="0dp"
@@ -318,7 +318,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/notesButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/dialog_lesson_details.xml b/app/src/main/res/layout/dialog_lesson_details.xml
index 03a3c843..defb4d2c 100644
--- a/app/src/main/res/layout/dialog_lesson_details.xml
+++ b/app/src/main/res/layout/dialog_lesson_details.xml
@@ -148,7 +148,7 @@
 
                 <Button
                     android:id="@+id/shiftedGoTo"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/dialog_lesson_go_to_button" />
@@ -347,7 +347,7 @@
 
                 <Button
                     android:id="@+id/attendanceDetails"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/dialog_lesson_attendance_details" />
@@ -401,7 +401,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/notesButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/dialog_profile_config.xml b/app/src/main/res/layout/dialog_profile_config.xml
index 776d62a1..635d5365 100644
--- a/app/src/main/res/layout/dialog_profile_config.xml
+++ b/app/src/main/res/layout/dialog_profile_config.xml
@@ -68,7 +68,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/nameLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp">
@@ -102,7 +102,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/logoutButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/dialog_register_unavailable.xml b/app/src/main/res/layout/dialog_register_unavailable.xml
index e6c3e16b..717a78ee 100644
--- a/app/src/main/res/layout/dialog_register_unavailable.xml
+++ b/app/src/main/res/layout/dialog_register_unavailable.xml
@@ -57,7 +57,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/readMore"
-                    style="@style/Widget.MaterialComponents.Button"
+                    style="@style/Widget.Material3.Button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/event_list_item.xml b/app/src/main/res/layout/event_list_item.xml
index 9a13cfdd..aca454ef 100644
--- a/app/src/main/res/layout/event_list_item.xml
+++ b/app/src/main/res/layout/event_list_item.xml
@@ -83,7 +83,7 @@
             <!-- cmd_pencil_outline -->
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/editButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout/fragment_debug.xml b/app/src/main/res/layout/fragment_debug.xml
index f87bd64a..b24c08bc 100644
--- a/app/src/main/res/layout/fragment_debug.xml
+++ b/app/src/main/res/layout/fragment_debug.xml
@@ -13,14 +13,14 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
         android:layout_marginTop="8dp"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/runText"
-            style="@style/Widget.MaterialComponents.TextInputEditText.OutlinedBox"
+            style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="Run command" />
@@ -43,7 +43,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
-        style="@style/Widget.MaterialComponents.Button"
+        style="@style/Widget.Material3.Button"
         android:text="Run"
         app:layout_constraintEnd_toStartOf="@+id/guideline2"
         app:layout_constraintStart_toStartOf="parent"
@@ -61,7 +61,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
-        style="@style/Widget.MaterialComponents.Button"
+        style="@style/Widget.Material3.Button"
         android:text="AppConfig"
         app:layout_constraintEnd_toStartOf="@+id/guideline3"
         app:layout_constraintStart_toStartOf="@+id/guideline2"
@@ -79,7 +79,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
-        style="@style/Widget.MaterialComponents.Button"
+        style="@style/Widget.Material3.Button"
         android:text="AppProfile"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline3"
diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml
index 79d1466d..718fc919 100644
--- a/app/src/main/res/layout/fragment_feedback.xml
+++ b/app/src/main/res/layout/fragment_feedback.xml
@@ -8,7 +8,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/targetDeviceLayout"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
@@ -39,7 +39,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/faqButton"
-                style="@style/Widget.MaterialComponents.Button"
+                style="@style/Widget.Material3.Button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -66,7 +66,7 @@
                 android:textSize="20sp" />
 
             <com.google.android.material.textfield.TextInputLayout
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                style="@style/Widget.Material3.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="8dp"
@@ -88,7 +88,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/sendButton"
-                style="@style/Widget.MaterialComponents.Button"
+                style="@style/Widget.Material3.Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 77f63107..e72f7ef9 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -55,7 +55,7 @@
 
                     <Button
                         android:id="@+id/configureCards"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_timetable_v2.xml b/app/src/main/res/layout/fragment_timetable_v2.xml
index 85f18695..15f3049e 100644
--- a/app/src/main/res/layout/fragment_timetable_v2.xml
+++ b/app/src/main/res/layout/fragment_timetable_v2.xml
@@ -19,10 +19,9 @@
                 tools:visibility="gone">
 
                 <com.google.android.material.appbar.AppBarLayout
-                    style="@style/Widget.MaterialComponents.AppBarLayout.Surface"
+                    style="@style/Widget.Material3.AppBarLayout"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?colorSurface">
+                    android:layout_height="wrap_content">
 
                     <com.nshmura.recyclertablayout.RecyclerTabLayout
                         android:id="@+id/tabLayout"
diff --git a/app/src/main/res/layout/grades_item_stats.xml b/app/src/main/res/layout/grades_item_stats.xml
index 8bddb7de..cd20d192 100644
--- a/app/src/main/res/layout/grades_item_stats.xml
+++ b/app/src/main/res/layout/grades_item_stats.xml
@@ -319,7 +319,7 @@
 
             <Button
                 android:id="@+id/customValueButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/lab_fragment.xml b/app/src/main/res/layout/lab_fragment.xml
index af55e6f0..09933028 100644
--- a/app/src/main/res/layout/lab_fragment.xml
+++ b/app/src/main/res/layout/lab_fragment.xml
@@ -132,7 +132,7 @@
 
             <pl.szczodrzynski.edziennik.utils.TextInputDropDown
                 android:id="@+id/profile"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
@@ -178,7 +178,7 @@
 
             <Button
                 android:id="@+id/rebuildConfig"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="16dp"
diff --git a/app/src/main/res/layout/login_chooser_fragment.xml b/app/src/main/res/layout/login_chooser_fragment.xml
index d39ef3da..f403873f 100644
--- a/app/src/main/res/layout/login_chooser_fragment.xml
+++ b/app/src/main/res/layout/login_chooser_fragment.xml
@@ -65,7 +65,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/cancelButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="16dp"
@@ -85,7 +85,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/helpButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="16dp"
diff --git a/app/src/main/res/layout/login_form_field_item.xml b/app/src/main/res/layout/login_form_field_item.xml
index 3a4a1660..4da85818 100644
--- a/app/src/main/res/layout/login_form_field_item.xml
+++ b/app/src/main/res/layout/login_form_field_item.xml
@@ -9,7 +9,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/textLayout"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:errorEnabled="true"
diff --git a/app/src/main/res/layout/login_form_fragment.xml b/app/src/main/res/layout/login_form_fragment.xml
index c1026eb7..a4d905b3 100644
--- a/app/src/main/res/layout/login_form_fragment.xml
+++ b/app/src/main/res/layout/login_form_fragment.xml
@@ -130,7 +130,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/backButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="16dp"
diff --git a/app/src/main/res/layout/login_form_item_qr.xml b/app/src/main/res/layout/login_form_item_qr.xml
index ab46a2be..e9a707d7 100644
--- a/app/src/main/res/layout/login_form_item_qr.xml
+++ b/app/src/main/res/layout/login_form_item_qr.xml
@@ -14,7 +14,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/textLayout"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/app/src/main/res/layout/login_platform_list_fragment.xml b/app/src/main/res/layout/login_platform_list_fragment.xml
index 7604f1c7..0a43c667 100644
--- a/app/src/main/res/layout/login_platform_list_fragment.xml
+++ b/app/src/main/res/layout/login_platform_list_fragment.xml
@@ -80,7 +80,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/reloadButton"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
@@ -95,7 +95,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/backButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="16dp"
@@ -109,7 +109,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/helpButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="16dp"
diff --git a/app/src/main/res/layout/login_summary_fragment.xml b/app/src/main/res/layout/login_summary_fragment.xml
index 3f4ba4dd..584dab46 100644
--- a/app/src/main/res/layout/login_summary_fragment.xml
+++ b/app/src/main/res/layout/login_summary_fragment.xml
@@ -75,7 +75,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/anotherButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="16dp"
diff --git a/app/src/main/res/layout/message_fragment.xml b/app/src/main/res/layout/message_fragment.xml
index e53ceb1f..177cfe14 100644
--- a/app/src/main/res/layout/message_fragment.xml
+++ b/app/src/main/res/layout/message_fragment.xml
@@ -205,7 +205,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/replyButton"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_marginHorizontal="4dp"
@@ -219,7 +219,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/forwardButton"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_marginHorizontal="4dp"
@@ -233,7 +233,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/deleteButton"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_marginHorizontal="4dp"
@@ -247,7 +247,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/downloadButton"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_marginHorizontal="4dp"
@@ -263,7 +263,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/notesButton"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/messages_compose_fragment.xml b/app/src/main/res/layout/messages_compose_fragment.xml
index 032550bb..65f014fe 100644
--- a/app/src/main/res/layout/messages_compose_fragment.xml
+++ b/app/src/main/res/layout/messages_compose_fragment.xml
@@ -15,7 +15,7 @@
         android:paddingBottom="40dp"><!-- half of the FAB's size -->
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/recipientsLayout"
-            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense"
+            style="@style/Widget.Material3.TextInputLayout.FilledBox.Dense"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:boxBackgroundColor="@android:color/transparent"
@@ -25,7 +25,7 @@
 
             <com.hootsuite.nachos.NachoTextView
                 android:id="@+id/recipients"
-                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox.Dense"
+                style="@style/Widget.Material3.TextInputEditText.FilledBox.Dense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:focusable="true"
@@ -36,7 +36,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/subjectLayout"
-            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+            style="@style/Widget.Material3.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:boxBackgroundColor="@android:color/transparent"
@@ -46,7 +46,7 @@
 
             <pl.szczodrzynski.edziennik.utils.TextInputKeyboardEdit
                 android:id="@+id/subject"
-                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                style="@style/Widget.Material3.TextInputEditText.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:focusable="true"
@@ -86,7 +86,7 @@
 
         <Button
             android:id="@+id/breakpoints"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="8dp"
diff --git a/app/src/main/res/layout/messages_config_dialog.xml b/app/src/main/res/layout/messages_config_dialog.xml
index d0205b39..918e1838 100644
--- a/app/src/main/res/layout/messages_config_dialog.xml
+++ b/app/src/main/res/layout/messages_config_dialog.xml
@@ -53,7 +53,7 @@
                 android:text="@string/messages_config_greeting_on_forward" />
 
             <com.google.android.material.textfield.TextInputLayout
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/note_editor_dialog.xml b/app/src/main/res/layout/note_editor_dialog.xml
index 2335bda1..ca5801cc 100644
--- a/app/src/main/res/layout/note_editor_dialog.xml
+++ b/app/src/main/res/layout/note_editor_dialog.xml
@@ -51,7 +51,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/topicLayout"
-                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
@@ -70,7 +70,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/bodyLayout"
-                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
@@ -124,7 +124,7 @@
                     android:textAppearance="@style/NavView.TextView.Helper" />
 
                 <com.google.android.material.textfield.TextInputLayout
-                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/note_list_item.xml b/app/src/main/res/layout/note_list_item.xml
index 910d06ab..5d5c3383 100644
--- a/app/src/main/res/layout/note_list_item.xml
+++ b/app/src/main/res/layout/note_list_item.xml
@@ -36,7 +36,7 @@
             <!-- cmd_pencil_outline -->
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/editButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout/search_item.xml b/app/src/main/res/layout/search_item.xml
index e459e61a..0a6824fa 100644
--- a/app/src/main/res/layout/search_item.xml
+++ b/app/src/main/res/layout/search_item.xml
@@ -9,7 +9,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/searchLayout"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
diff --git a/app/src/main/res/layout/styled_text_buttons.xml b/app/src/main/res/layout/styled_text_buttons.xml
index a87e3e41..ac2c7b69 100644
--- a/app/src/main/res/layout/styled_text_buttons.xml
+++ b/app/src/main/res/layout/styled_text_buttons.xml
@@ -22,7 +22,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/bold"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/community_material_font_v5_8_55"
@@ -33,7 +33,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/italic"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/community_material_font_v5_8_55"
@@ -44,7 +44,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/underline"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/community_material_font_v5_8_55"
@@ -55,7 +55,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/strike"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/community_material_font_v5_8_55"
@@ -66,7 +66,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/subscript"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/community_material_font_v5_8_55"
@@ -77,7 +77,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/superscript"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/community_material_font_v5_8_55"
@@ -91,7 +91,7 @@
     <!-- android:layout_marginTop="-13dp" -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/clear"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
diff --git a/app/src/main/res/layout/styled_text_dialog.xml b/app/src/main/res/layout/styled_text_dialog.xml
index f90a1c2c..9bd4cea1 100644
--- a/app/src/main/res/layout/styled_text_dialog.xml
+++ b/app/src/main/res/layout/styled_text_dialog.xml
@@ -15,7 +15,7 @@
         android:padding="24dp">
 
         <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="250dp"
diff --git a/app/src/main/res/layout/template_page_fragment.xml b/app/src/main/res/layout/template_page_fragment.xml
index a83f29b6..90d392f1 100644
--- a/app/src/main/res/layout/template_page_fragment.xml
+++ b/app/src/main/res/layout/template_page_fragment.xml
@@ -20,7 +20,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/button"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
diff --git a/app/src/main/res/layout/web_push_fragment.xml b/app/src/main/res/layout/web_push_fragment.xml
index ca953e3a..71672500 100644
--- a/app/src/main/res/layout/web_push_fragment.xml
+++ b/app/src/main/res/layout/web_push_fragment.xml
@@ -54,7 +54,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/tokenLayout"
-                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                    style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dd709d59..f2ab937d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -71,11 +71,11 @@
         <item name="android:popupBackground">@color/windowBackgroundDark</item>
     </style>
 
-    <style name="AppTheme.MaterialAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+    <style name="AppTheme.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="materialAlertDialogTitleTextStyle">@style/AppTheme.MaterialAlertDialog.TitleText</item>
         <item name="materialAlertDialogBodyTextStyle">@style/AppTheme.MaterialAlertDialog.BodyText</item>
     </style>
-    <style name="AppTheme.MaterialAlertDialog.TitleText" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
+    <style name="AppTheme.MaterialAlertDialog.TitleText" parent="MaterialAlertDialog.Material3.Title.Text">
         <item name="textSize">20sp</item>
         <item name="android:textSize">20sp</item>
         <item name="textColor">?android:textColorPrimary</item>