Settings M3 redesign wip

2023-06-04 02:04:55 +03:00
parent 7c6ec2e3d7
commit 31c8665653
139 changed files with 4520 additions and 1145 deletions
--- a/mastodon/src/main/res/anim/fade_out_fast.xml
+++ b/mastodon/src/main/res/anim/fade_out_fast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
 	android:duration="200"
-	android:interpolator="@android:anim/decelerate_interpolator"
+	android:interpolator="@interpolator/m3_sys_motion_easing_standard_decelerate"
 	android:fromAlpha="1.0"
 	android:toAlpha="0.0"/>
--- a/mastodon/src/main/res/color/selectable_icon_tint.xml
+++ b/mastodon/src/main/res/color/selectable_icon_tint.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="?colorM3Primary" android:state_selected="true"/>
+	<item android:color="?colorM3OnSurfaceVariant"/>
+</selector>
--- a/mastodon/src/main/res/drawable/bg_settings_banner.xml
+++ b/mastodon/src/main/res/drawable/bg_settings_banner.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<stroke android:width="1dp" android:color="?colorM3OutlineVariant"/>
+	<corners android:radius="12dp"/>
+</shape>
--- a/mastodon/src/main/res/drawable/ic_actionmode_close.xml
+++ b/mastodon/src/main/res/drawable/ic_actionmode_close.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?colorM3OnPrimary"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_alt_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_alt_24px.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,16V10.167C3,9.836 3.11,9.564 3.33,9.35C3.57,9.117 3.86,9 4.2,9H7.8C8.14,9 8.42,9.117 8.64,9.35C8.88,9.564 9,9.836 9,10.167V16H7.2V14.25H4.8V16H3ZM4.8,12.5H7.2V10.75H4.8V12.5Z"
+      android:fillColor="#49454F"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17.1,10.75V16H18.9V10.75H21V9H15V10.75H17.1Z"
+      android:fillColor="#49454F"/>
+  <path
+      android:pathData="M10.2,9V16H15V14.25H12V9H10.2Z"
+      android:fillColor="#49454F"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_animation_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_animation_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9,22Q7.55,22 6.275,21.45Q5,20.9 4.05,19.95Q3.1,19 2.55,17.725Q2,16.45 2,15Q2,12.975 3.05,11.3Q4.1,9.625 5.8,8.75Q6.3,7.775 7.038,7.037Q7.775,6.3 8.75,5.8Q9.575,4.1 11.275,3.05Q12.975,2 15,2Q16.45,2 17.725,2.55Q19,3.1 19.95,4.05Q20.9,5 21.45,6.275Q22,7.55 22,9Q22,11.125 20.95,12.75Q19.9,14.375 18.2,15.25Q17.7,16.225 16.962,16.962Q16.225,17.7 15.25,18.2Q14.375,19.9 12.7,20.95Q11.025,22 9,22ZM9,20Q9.825,20 10.588,19.75Q11.35,19.5 12,19Q10.55,19 9.275,18.45Q8,17.9 7.05,16.95Q6.1,16 5.55,14.725Q5,13.45 5,12Q4.5,12.65 4.25,13.412Q4,14.175 4,15Q4,16.05 4.4,16.95Q4.8,17.85 5.475,18.525Q6.15,19.2 7.05,19.6Q7.95,20 9,20ZM12,17Q12.825,17 13.613,16.75Q14.4,16.5 15.05,16Q13.575,16 12.3,15.438Q11.025,14.875 10.075,13.925Q9.125,12.975 8.562,11.7Q8,10.425 8,8.95Q7.5,9.6 7.25,10.387Q7,11.175 7,12Q7,13.05 7.388,13.95Q7.775,14.85 8.475,15.525Q9.15,16.225 10.05,16.613Q10.95,17 12,17ZM15,14Q15.45,14 15.863,13.925Q16.275,13.85 16.7,13.7Q17.25,12.2 16.863,10.812Q16.475,9.425 15.525,8.475Q14.575,7.525 13.188,7.137Q11.8,6.75 10.3,7.3Q10.15,7.725 10.075,8.137Q10,8.55 10,9Q10,10.05 10.387,10.95Q10.775,11.85 11.475,12.525Q12.15,13.225 13.05,13.613Q13.95,14 15,14ZM19,12.05Q19.5,11.4 19.75,10.612Q20,9.825 20,9Q20,7.95 19.613,7.05Q19.225,6.15 18.525,5.475Q17.85,4.775 16.95,4.387Q16.05,4 15,4Q14.125,4 13.363,4.25Q12.6,4.5 11.95,5Q13.425,5 14.7,5.562Q15.975,6.125 16.925,7.075Q17.875,8.025 18.438,9.3Q19,10.575 19,12.05Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_apk_install_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_apk_install_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,22Q3.175,22 2.588,21.413Q2,20.825 2,20V4Q2,3.175 2.588,2.587Q3.175,2 4,2H12L18,8V12.25H16V9H11V4H4Q4,4 4,4Q4,4 4,4V20Q4,20 4,20Q4,20 4,20H15V22ZM4,20V12.25V9V4Q4,4 4,4Q4,4 4,4V20Q4,20 4,20Q4,20 4,20ZM5,19Q5.1,17.775 5.75,16.75Q6.4,15.725 7.45,15.125L6.5,13.425Q6.5,13.4 6.6,13.05Q6.725,13 6.838,13Q6.95,13 7,13.125L7.975,14.875Q8.475,14.675 8.975,14.562Q9.475,14.45 10,14.45Q10.525,14.45 11.025,14.562Q11.525,14.675 12.025,14.875L13,13.125Q13,13.125 13.375,13.025Q13.5,13.075 13.525,13.2Q13.55,13.325 13.5,13.425L12.55,15.125Q13.6,15.725 14.25,16.75Q14.9,17.775 15,19ZM7.75,17.5Q7.95,17.5 8.1,17.35Q8.25,17.2 8.25,17Q8.25,16.8 8.1,16.65Q7.95,16.5 7.75,16.5Q7.55,16.5 7.4,16.65Q7.25,16.8 7.25,17Q7.25,17.2 7.4,17.35Q7.55,17.5 7.75,17.5ZM12.25,17.5Q12.45,17.5 12.6,17.35Q12.75,17.2 12.75,17Q12.75,16.8 12.6,16.65Q12.45,16.5 12.25,16.5Q12.05,16.5 11.9,16.65Q11.75,16.8 11.75,17Q11.75,17.2 11.9,17.35Q12.05,17.5 12.25,17.5ZM20,22 L16,18 17.4,16.575 19,18.15V14H21V18.15L22.6,16.575L24,18Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_app_badging_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_app_badging_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q507,80 533,83.5Q559,87 584,94Q568,109 555.5,127Q543,145 535,165Q521,163 507.5,161.5Q494,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800Q614,800 707,707Q800,614 800,480Q800,466 798.5,452.5Q797,439 795,425Q815,417 833,404.5Q851,392 866,376Q873,401 876.5,427Q880,453 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480ZM720,360Q670,360 635,325Q600,290 600,240Q600,190 635,155Q670,120 720,120Q770,120 805,155Q840,190 840,240Q840,290 805,325Q770,360 720,360Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_dark_mode_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_dark_mode_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,21Q8.25,21 5.625,18.375Q3,15.75 3,12Q3,8.25 5.625,5.625Q8.25,3 12,3Q12.35,3 12.688,3.025Q13.025,3.05 13.35,3.1Q12.325,3.825 11.713,4.987Q11.1,6.15 11.1,7.5Q11.1,9.75 12.675,11.325Q14.25,12.9 16.5,12.9Q17.875,12.9 19.025,12.287Q20.175,11.675 20.9,10.65Q20.95,10.975 20.975,11.312Q21,11.65 21,12Q21,15.75 18.375,18.375Q15.75,21 12,21ZM12,19Q14.2,19 15.95,17.788Q17.7,16.575 18.5,14.625Q18,14.75 17.5,14.825Q17,14.9 16.5,14.9Q13.425,14.9 11.262,12.738Q9.1,10.575 9.1,7.5Q9.1,7 9.175,6.5Q9.25,6 9.375,5.5Q7.425,6.3 6.213,8.05Q5,9.8 5,12Q5,14.9 7.05,16.95Q9.1,19 12,19ZM11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_dns_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_dns_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7.5,6Q6.875,6 6.438,6.438Q6,6.875 6,7.5Q6,8.125 6.438,8.562Q6.875,9 7.5,9Q8.125,9 8.562,8.562Q9,8.125 9,7.5Q9,6.875 8.562,6.438Q8.125,6 7.5,6ZM7.5,16Q6.875,16 6.438,16.438Q6,16.875 6,17.5Q6,18.125 6.438,18.562Q6.875,19 7.5,19Q8.125,19 8.562,18.562Q9,18.125 9,17.5Q9,16.875 8.562,16.438Q8.125,16 7.5,16ZM4,3H20Q20.425,3 20.712,3.287Q21,3.575 21,4V11Q21,11.425 20.712,11.712Q20.425,12 20,12H4Q3.575,12 3.288,11.712Q3,11.425 3,11V4Q3,3.575 3.288,3.287Q3.575,3 4,3ZM5,5V10H19V5ZM4,13H20Q20.425,13 20.712,13.287Q21,13.575 21,14V21Q21,21.425 20.712,21.712Q20.425,22 20,22H4Q3.575,22 3.288,21.712Q3,21.425 3,21V14Q3,13.575 3.288,13.287Q3.575,13 4,13ZM5,15V20H19V15ZM5,5V10ZM5,15V20Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_emoticon_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_emoticon_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M260,680Q234,680 217,663Q200,646 200,620Q200,595 217,577.5Q234,560 260,560Q285,560 302.5,577.5Q320,595 320,620Q320,646 302.5,663Q285,680 260,680ZM260,400Q234,400 217,383Q200,366 200,340Q200,315 217,297.5Q234,280 260,280Q285,280 302.5,297.5Q320,315 320,340Q320,366 302.5,383Q285,400 260,400ZM400,520L400,440L560,440L560,520L400,520ZM688,720L622,676Q650,633 665,583.5Q680,534 680,480Q680,414 658.5,356Q637,298 598,251L659,200Q707,257 733.5,328.5Q760,400 760,480Q760,547 741,607.5Q722,668 688,720Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_filter_alt_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_filter_alt_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M14,13V19Q14,19.425 13.713,19.712Q13.425,20 13,20H11Q10.575,20 10.288,19.712Q10,19.425 10,19V13L4.2,5.6Q3.825,5.1 4.088,4.55Q4.35,4 5,4H19Q19.65,4 19.913,4.55Q20.175,5.1 19.8,5.6ZM12,12.3 L16.95,6H7.05ZM12,12.3Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_group_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_group_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M1,20V17.2Q1,16.35 1.438,15.637Q1.875,14.925 2.6,14.55Q4.15,13.775 5.75,13.387Q7.35,13 9,13Q10.65,13 12.25,13.387Q13.85,13.775 15.4,14.55Q16.125,14.925 16.562,15.637Q17,16.35 17,17.2V20ZM19,20V17Q19,15.9 18.388,14.887Q17.775,13.875 16.65,13.15Q17.925,13.3 19.05,13.662Q20.175,14.025 21.15,14.55Q22.05,15.05 22.525,15.662Q23,16.275 23,17V20ZM9,12Q7.35,12 6.175,10.825Q5,9.65 5,8Q5,6.35 6.175,5.175Q7.35,4 9,4Q10.65,4 11.825,5.175Q13,6.35 13,8Q13,9.65 11.825,10.825Q10.65,12 9,12ZM15,12Q14.725,12 14.3,11.938Q13.875,11.875 13.6,11.8Q14.275,11 14.637,10.025Q15,9.05 15,8Q15,6.95 14.637,5.975Q14.275,5 13.6,4.2Q13.95,4.075 14.3,4.037Q14.65,4 15,4Q16.65,4 17.825,5.175Q19,6.35 19,8Q19,9.65 17.825,10.825Q16.65,12 15,12ZM3,18H15V17.2Q15,16.925 14.863,16.7Q14.725,16.475 14.5,16.35Q13.15,15.675 11.775,15.337Q10.4,15 9,15Q7.6,15 6.225,15.337Q4.85,15.675 3.5,16.35Q3.275,16.475 3.138,16.7Q3,16.925 3,17.2ZM9,10Q9.825,10 10.413,9.412Q11,8.825 11,8Q11,7.175 10.413,6.588Q9.825,6 9,6Q8.175,6 7.588,6.588Q7,7.175 7,8Q7,8.825 7.588,9.412Q8.175,10 9,10ZM9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18ZM9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_help_fill1_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_help_fill1_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.95,18Q12.475,18 12.838,17.637Q13.2,17.275 13.2,16.75Q13.2,16.225 12.838,15.863Q12.475,15.5 11.95,15.5Q11.425,15.5 11.062,15.863Q10.7,16.225 10.7,16.75Q10.7,17.275 11.062,17.637Q11.425,18 11.95,18ZM11.05,14.15H12.9Q12.9,13.325 13.088,12.85Q13.275,12.375 14.15,11.55Q14.8,10.9 15.175,10.312Q15.55,9.725 15.55,8.9Q15.55,7.5 14.525,6.75Q13.5,6 12.1,6Q10.675,6 9.788,6.75Q8.9,7.5 8.55,8.55L10.2,9.2Q10.325,8.75 10.763,8.225Q11.2,7.7 12.1,7.7Q12.9,7.7 13.3,8.137Q13.7,8.575 13.7,9.1Q13.7,9.6 13.4,10.037Q13.1,10.475 12.65,10.85Q11.55,11.825 11.3,12.325Q11.05,12.825 11.05,14.15ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_help_selectable.xml
+++ b/mastodon/src/main/res/drawable/ic_help_selectable.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/ic_help_fill1_24px" android:state_selected="true"/>
+	<item android:drawable="@drawable/ic_help_24px"/>
+</selector>
--- a/mastodon/src/main/res/drawable/ic_info_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_info_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11,17H13V11H11ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,20Q15.35,20 17.675,17.675Q20,15.35 20,12Q20,8.65 17.675,6.325Q15.35,4 12,4Q8.65,4 6.325,6.325Q4,8.65 4,12Q4,15.35 6.325,17.675Q8.65,20 12,20ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_lock_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_lock_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,22Q5.175,22 4.588,21.413Q4,20.825 4,20V10Q4,9.175 4.588,8.587Q5.175,8 6,8H7V6Q7,3.925 8.463,2.462Q9.925,1 12,1Q14.075,1 15.538,2.462Q17,3.925 17,6V8H18Q18.825,8 19.413,8.587Q20,9.175 20,10V20Q20,20.825 19.413,21.413Q18.825,22 18,22ZM9,8H15V6Q15,4.75 14.125,3.875Q13.25,3 12,3Q10.75,3 9.875,3.875Q9,4.75 9,6ZM6,20H18Q18,20 18,20Q18,20 18,20V10Q18,10 18,10Q18,10 18,10H6Q6,10 6,10Q6,10 6,10V20Q6,20 6,20Q6,20 6,20ZM12,17Q12.825,17 13.413,16.413Q14,15.825 14,15Q14,14.175 13.413,13.587Q12.825,13 12,13Q11.175,13 10.588,13.587Q10,14.175 10,15Q10,15.825 10.588,16.413Q11.175,17 12,17ZM12,15Q12,15 12,15Q12,15 12,15Q12,15 12,15Q12,15 12,15Q12,15 12,15Q12,15 12,15Q12,15 12,15Q12,15 12,15Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_mail_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_mail_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,20Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H20Q20.825,4 21.413,4.588Q22,5.175 22,6V18Q22,18.825 21.413,19.413Q20.825,20 20,20ZM12,13 L4,8V18Q4,18 4,18Q4,18 4,18H20Q20,18 20,18Q20,18 20,18V8ZM12,11 L20,6H4ZM4,8V6V8V18Q4,18 4,18Q4,18 4,18Q4,18 4,18Q4,18 4,18Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_no_adult_content_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_no_adult_content_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,20Q13.4,20 14.637,19.562Q15.875,19.125 16.9,18.325L13.575,15H16.4L18.3,16.9Q19.1,15.875 19.55,14.637Q20,13.4 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q10.6,4 9.363,4.45Q8.125,4.9 7.1,5.7L10.425,9H7.6L5.7,7.1Q4.9,8.125 4.45,9.363Q4,10.6 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20ZM5,14 L6.5,12 5,10H6.5L7.25,11L8,10H9.5L8,12L9.5,14H8L7.25,13L6.5,14ZM9.75,14 L11.25,12 9.75,10H11.25L12,11L12.75,10H14.25L12.75,12L14.25,14H12.75L12,13L11.25,14ZM14.5,14 L16,12 14.5,10H16L16.75,11L17.5,10H19L17.5,12L19,14H17.5L16.75,13L16,14Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_notifications_paused_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_notifications_paused_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9.25,16H14.75V14.2H12L14.75,10.8V9H9.25V10.8H12L9.25,14.2ZM4,19V17H6V10Q6,7.925 7.25,6.312Q8.5,4.7 10.5,4.2V3.5Q10.5,2.875 10.938,2.438Q11.375,2 12,2Q12.625,2 13.062,2.438Q13.5,2.875 13.5,3.5V4.2Q15.5,4.7 16.75,6.312Q18,7.925 18,10V17H20V19ZM12,11.5Q12,11.5 12,11.5Q12,11.5 12,11.5Q12,11.5 12,11.5Q12,11.5 12,11.5ZM12,22Q11.175,22 10.588,21.413Q10,20.825 10,20H14Q14,20.825 13.413,21.413Q12.825,22 12,22ZM8,17H16V10Q16,8.35 14.825,7.175Q13.65,6 12,6Q10.35,6 9.175,7.175Q8,8.35 8,10Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_open_in_browser_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_open_in_browser_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21H15V19H19Q19,19 19,19Q19,19 19,19V7H5V19Q5,19 5,19Q5,19 5,19H9V21ZM11,21V14.85L9.4,16.45L8,15L12,11L16,15L14.6,16.45L13,14.85V21Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_person_remove_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_person_remove_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M16,11V9H22V11ZM9,12Q7.35,12 6.175,10.825Q5,9.65 5,8Q5,6.35 6.175,5.175Q7.35,4 9,4Q10.65,4 11.825,5.175Q13,6.35 13,8Q13,9.65 11.825,10.825Q10.65,12 9,12ZM1,20V17.2Q1,16.35 1.438,15.637Q1.875,14.925 2.6,14.55Q4.15,13.775 5.75,13.387Q7.35,13 9,13Q10.65,13 12.25,13.387Q13.85,13.775 15.4,14.55Q16.125,14.925 16.562,15.637Q17,16.35 17,17.2V20ZM3,18H15V17.2Q15,16.925 14.863,16.7Q14.725,16.475 14.5,16.35Q13.15,15.675 11.775,15.337Q10.4,15 9,15Q7.6,15 6.225,15.337Q4.85,15.675 3.5,16.35Q3.275,16.475 3.138,16.7Q3,16.925 3,17.2ZM9,10Q9.825,10 10.413,9.412Q11,8.825 11,8Q11,7.175 10.413,6.588Q9.825,6 9,6Q8.175,6 7.588,6.588Q7,7.175 7,8Q7,8.825 7.588,9.412Q8.175,10 9,10ZM9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8ZM9,15Q9,15 9,15Q9,15 9,15Q9,15 9,15Q9,15 9,15Q9,15 9,15Q9,15 9,15Q9,15 9,15Q9,15 9,15Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_settings_24_badged.xml
+++ b/mastodon/src/main/res/drawable/ic_settings_24_badged.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@drawable/ic_fluent_settings_24_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/>
+	<item android:drawable="@drawable/ic_settings_24px" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/>
 	<item android:width="14dp" android:height="14dp" android:gravity="top|right">
 		<shape android:shape="oval">
-			<stroke android:color="?android:colorPrimary" android:width="2dp"/>
-			<solid android:color="@color/primary_600"/>
+			<stroke android:color="?colorM3Error" android:width="2dp"/>
+			<solid android:color="?colorM3Error"/>
 		</shape>
 	</item>
 </layer-list>
--- a/mastodon/src/main/res/drawable/ic_settings_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_settings_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="?colorM3OnSurfaceVariant"
+      android:pathData="M9.25,22 L8.85,18.8Q8.525,18.675 8.238,18.5Q7.95,18.325 7.675,18.125L4.7,19.375L1.95,14.625L4.525,12.675Q4.5,12.5 4.5,12.337Q4.5,12.175 4.5,12Q4.5,11.825 4.5,11.662Q4.5,11.5 4.525,11.325L1.95,9.375L4.7,4.625L7.675,5.875Q7.95,5.675 8.25,5.5Q8.55,5.325 8.85,5.2L9.25,2H14.75L15.15,5.2Q15.475,5.325 15.763,5.5Q16.05,5.675 16.325,5.875L19.3,4.625L22.05,9.375L19.475,11.325Q19.5,11.5 19.5,11.662Q19.5,11.825 19.5,12Q19.5,12.175 19.5,12.337Q19.5,12.5 19.45,12.675L22.025,14.625L19.275,19.375L16.325,18.125Q16.05,18.325 15.75,18.5Q15.45,18.675 15.15,18.8L14.75,22ZM12.05,15.5Q13.5,15.5 14.525,14.475Q15.55,13.45 15.55,12Q15.55,10.55 14.525,9.525Q13.5,8.5 12.05,8.5Q10.575,8.5 9.562,9.525Q8.55,10.55 8.55,12Q8.55,13.45 9.562,14.475Q10.575,15.5 12.05,15.5ZM12.05,13.5Q11.425,13.5 10.988,13.062Q10.55,12.625 10.55,12Q10.55,11.375 10.988,10.938Q11.425,10.5 12.05,10.5Q12.675,10.5 13.113,10.938Q13.55,11.375 13.55,12Q13.55,12.625 13.113,13.062Q12.675,13.5 12.05,13.5ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM11,20H12.975L13.325,17.35Q14.1,17.15 14.763,16.762Q15.425,16.375 15.975,15.825L18.45,16.85L19.425,15.15L17.275,13.525Q17.4,13.175 17.45,12.787Q17.5,12.4 17.5,12Q17.5,11.6 17.45,11.212Q17.4,10.825 17.275,10.475L19.425,8.85L18.45,7.15L15.975,8.2Q15.425,7.625 14.763,7.237Q14.1,6.85 13.325,6.65L13,4H11.025L10.675,6.65Q9.9,6.85 9.238,7.237Q8.575,7.625 8.025,8.175L5.55,7.15L4.575,8.85L6.725,10.45Q6.6,10.825 6.55,11.2Q6.5,11.575 6.5,12Q6.5,12.4 6.55,12.775Q6.6,13.15 6.725,13.525L4.575,15.15L5.55,16.85L8.025,15.8Q8.575,16.375 9.238,16.762Q9.9,17.15 10.675,17.35Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_social_leaderboard_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_social_leaderboard_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,800Q555,800 607.5,747.5Q660,695 660,620Q660,545 607.5,492.5Q555,440 480,440Q405,440 352.5,492.5Q300,545 300,620Q300,695 352.5,747.5Q405,800 480,800ZM363,388Q383,377 405.5,370.5Q428,364 451,362L350,160L250,160L363,388ZM597,388L711,160L610,160L509,362Q532,364 554.5,370.5Q577,377 597,388ZM256,752Q239,723 229.5,689.5Q220,656 220,620Q220,584 229.5,550.5Q239,517 256,488Q256,488 256,488Q256,488 256,488Q214,502 187,537.5Q160,573 160,620Q160,667 187,702.5Q214,738 256,752Q256,752 256,752Q256,752 256,752ZM704,752Q746,738 773,702.5Q800,667 800,620Q800,573 773,537.5Q746,502 704,488Q704,488 704,488Q704,488 704,488Q721,517 730.5,550.5Q740,584 740,620Q740,656 730.5,689.5Q721,723 704,752Q704,752 704,752Q704,752 704,752ZM480,880Q440,880 403.5,868.5Q367,857 336,837Q327,839 318,839.5Q309,840 299,840Q208,840 144,776Q80,712 80,621Q80,534 138,472Q196,410 281,403Q281,403 281,403Q281,403 281,403L120,80L400,80L480,240L560,80L840,80L680,401Q680,401 680,401Q680,401 680,401Q765,409 822.5,471Q880,533 880,620Q880,712 816,776Q752,840 660,840Q651,840 641.5,839.5Q632,839 623,837Q592,857 556,868.5Q520,880 480,880ZM480,620Q480,620 480,620Q480,620 480,620Q480,620 480,620Q480,620 480,620Q480,620 480,620Q480,620 480,620Q480,620 480,620Q480,620 480,620ZM363,388L250,160L250,160L363,388Q363,388 363,388Q363,388 363,388ZM597,388Q597,388 597,388Q597,388 597,388L711,160L711,160L597,388ZM480,720L449,651L380,620L449,589L480,520L511,589L580,620L511,651L480,720Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_style_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_style_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3.975,19.8 L3.125,19.45Q2.35,19.125 2.088,18.325Q1.825,17.525 2.175,16.75L3.975,12.85ZM7.975,22Q7.15,22 6.562,21.413Q5.975,20.825 5.975,20V14L8.625,21.35Q8.7,21.525 8.775,21.688Q8.85,21.85 8.975,22ZM13.125,21.9Q12.325,22.2 11.575,21.825Q10.825,21.45 10.525,20.65L6.075,8.45Q5.775,7.65 6.125,6.887Q6.475,6.125 7.275,5.85L14.825,3.1Q15.625,2.8 16.375,3.175Q17.125,3.55 17.425,4.35L21.875,16.55Q22.175,17.35 21.825,18.113Q21.475,18.875 20.675,19.15ZM10.975,10Q11.4,10 11.688,9.712Q11.975,9.425 11.975,9Q11.975,8.575 11.688,8.287Q11.4,8 10.975,8Q10.55,8 10.263,8.287Q9.975,8.575 9.975,9Q9.975,9.425 10.263,9.712Q10.55,10 10.975,10ZM12.425,20 L19.975,17.25 15.525,5 7.975,7.75ZM7.975,7.75 L15.525,5Z"/>
+</vector>
--- a/mastodon/src/main/res/layout/alert_title_with_help.xml
+++ b/mastodon/src/main/res/layout/alert_title_with_help.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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">
+
+	<ImageButton
+		android:id="@+id/help"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_margin="4dp"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentEnd="true"
+		android:tint="@color/selectable_icon_tint"
+		android:background="@drawable/bg_round_ripple"
+		android:contentDescription="@string/help"
+		android:src="@drawable/ic_help_selectable"/>
+	
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_toStartOf="@id/help"
+		style="?android:windowTitleStyle"
+		android:singleLine="false"
+		android:maxLines="2"
+		android:minHeight="48dp"
+		android:gravity="center_vertical"
+		tools:text="Title"/>
+
+	<TextView
+		android:id="@+id/help_text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@id/title"
+		android:layout_marginTop="16dp"
+		android:textAppearance="@style/m3_body_medium"
+		android:textColor="?colorM3OnSurfaceVariant"
+		android:visibility="gone"
+		tools:visibility="visible"
+		tools:text="Supporting text"/>
+
+</RelativeLayout>
--- a/mastodon/src/main/res/layout/alert_title_with_supporting_text.xml
+++ b/mastodon/src/main/res/layout/alert_title_with_supporting_text.xml
@@ -0,0 +1,26 @@
+<?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"/>
+
+	<TextView
+		android:id="@+id/subtitle"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:maxLines="2"
+		android:textAppearance="@style/m3_body_medium"
+		android:textColor="?colorM3OnSurfaceVariant"
+		tools:text="Supporting text"/>
+
+</LinearLayout>
--- a/mastodon/src/main/res/layout/floating_hint_edit_text.xml
+++ b/mastodon/src/main/res/layout/floating_hint_edit_text.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingTop="4dp"
+	android:paddingBottom="12dp"
+	app:labelTextColor="@color/m3_outlined_text_field_label"
+	android:foreground="@drawable/bg_m3_outlined_text_field">
+
+	<EditText
+		android:id="@+id/edit"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginTop="8dp"
+		android:padding="16dp"
+		android:background="@null"
+		android:elevation="0dp"
+		android:singleLine="true"
+		android:textColorHint="?colorM3OnSurfaceVariant"
+		android:inputType="textCapSentences"/>
+
+</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
--- a/mastodon/src/main/res/layout/fragment_settings_server.xml
+++ b/mastodon/src/main/res/layout/fragment_settings_server.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<me.grishka.appkit.views.FragmentRootLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?android:windowBackground">
+
+	<org.joinmastodon.android.ui.views.NestedRecyclerScrollView
+		android:id="@+id/scroller"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		app:takePriorityOverChildViews="true"
+		android:fillViewport="true">
+		<org.joinmastodon.android.ui.views.TopBarsScrollAwayLinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:orientation="vertical">
+
+			<include layout="@layout/appkit_toolbar"/>
+
+			<TextView
+				android:id="@+id/real_title"
+				android:layout_width="match_parent"
+				android:layout_height="60dp"
+				android:singleLine="true"
+				android:ellipsize="marquee"
+				android:paddingHorizontal="16dp"
+				android:paddingTop="4dp"
+				android:textAppearance="@style/m3_headline_small"
+				android:textColor="?colorM3OnSurface"
+				tools:text="mastodon.social"/>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:orientation="vertical">
+
+				<org.joinmastodon.android.ui.tabs.TabLayout
+					android:id="@+id/tabbar"
+					android:layout_width="match_parent"
+					android:layout_height="48dp"
+					app:tabGravity="fill"
+					app:tabIndicator="@drawable/tab_indicator_m3"
+					app:tabIndicatorAnimationMode="elastic"
+					app:tabIndicatorColor="?colorM3Primary"
+					app:tabIndicatorFullWidth="false"
+					app:tabMinWidth="0dp"
+					app:tabMode="fixed" />
+
+				<View
+					android:layout_width="match_parent"
+					android:layout_height="1dp"
+					android:background="?colorM3SurfaceVariant"/>
+
+				<androidx.viewpager2.widget.ViewPager2
+					android:id="@+id/pager"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"/>
+
+			</LinearLayout>
+
+		</org.joinmastodon.android.ui.views.TopBarsScrollAwayLinearLayout>
+	</org.joinmastodon.android.ui.views.NestedRecyclerScrollView>
+
+</me.grishka.appkit.views.FragmentRootLinearLayout>
--- a/mastodon/src/main/res/layout/item_generic_list.xml
+++ b/mastodon/src/main/res/layout/item_generic_list.xml
@@ -0,0 +1,14 @@
+<?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="horizontal"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:minHeight="56dp"
+	android:paddingHorizontal="16dp"
+	android:paddingVertical="12dp"
+	android:gravity="center_vertical">
+
+	<include layout="@layout/item_generic_list_content"/>
+
+</LinearLayout>
--- a/mastodon/src/main/res/layout/item_generic_list_checkable.xml
+++ b/mastodon/src/main/res/layout/item_generic_list_checkable.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.joinmastodon.android.ui.views.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="horizontal"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:minHeight="56dp"
+	android:paddingHorizontal="16dp"
+	android:paddingVertical="12dp"
+	android:gravity="center_vertical">
+
+	<include layout="@layout/item_generic_list_content"/>
+
+</org.joinmastodon.android.ui.views.CheckableLinearLayout>
--- a/mastodon/src/main/res/layout/item_generic_list_content.xml
+++ b/mastodon/src/main/res/layout/item_generic_list_content.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	tools:showIn="@layout/item_generic_list">
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="24dp"
+		android:layout_height="24dp"
+		android:layout_marginEnd="16dp"
+		android:importantForAccessibility="no"
+		android:tint="?colorM3OnSurfaceVariant"
+		tools:src="@drawable/ic_settings_24px"/>
+
+	<LinearLayout
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:minHeight="24dp"
+			android:gravity="center_vertical"
+			android:textAppearance="@style/m3_body_large"
+			android:textColor="?colorM3OnSurface"
+			tools:text="Title"/>
+
+		<TextView
+			android:id="@+id/subtitle"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:minHeight="20dp"
+			android:gravity="center_vertical"
+			android:textAppearance="@style/m3_body_medium"
+			android:textColor="?colorM3OnSurfaceVariant"
+			tools:text="Subtitle"/>
+
+	</LinearLayout>
+</merge>
--- a/mastodon/src/main/res/layout/item_settings_banner.xml
+++ b/mastodon/src/main/res/layout/item_settings_banner.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginVertical="8dp"
+	android:layout_marginHorizontal="16dp"
+	android:padding="16dp"
+	android:clipToPadding="false"
+	android:background="@drawable/bg_settings_banner">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_marginEnd="16dp"
+		android:scaleType="center"
+		android:importantForAccessibility="no"
+		android:tint="?colorM3OnPrimaryContainer"
+		android:background="@drawable/white_circle"
+		android:backgroundTint="?colorM3PrimaryContainer"
+		tools:src="@drawable/ic_notifications_paused_24px"/>
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="24dp"
+		android:layout_toEndOf="@id/icon"
+		android:layout_marginBottom="2dp"
+		android:textAppearance="@style/m3_title_medium"
+		android:textColor="?colorM3OnSurface"
+		android:singleLine="true"
+		android:gravity="center_vertical"
+		tools:text="Title"/>
+
+	<TextView
+		android:id="@+id/text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_toEndOf="@id/icon"
+		android:layout_below="@id/title"
+		android:textAppearance="@style/m3_body_medium"
+		android:minHeight="20dp"
+		android:gravity="center_vertical"
+		android:textColor="?colorM3OnSurface"
+		tools:text="@string/pause_notifications_banner"/>
+
+	<Button
+		android:id="@+id/button"
+		android:layout_width="wrap_content"
+		android:layout_height="28dp"
+		android:layout_below="@id/text"
+		android:layout_toEndOf="@id/icon"
+		android:layout_marginStart="-8dp"
+		android:layout_marginBottom="-4dp"
+		android:layout_marginTop="8dp"
+		style="@style/Widget.Mastodon.M3.Button.Text"
+		android:paddingHorizontal="8dp"
+		android:paddingVertical="4dp"
+		android:minWidth="0dp"
+		tools:text="@string/resume_notifications_now"/>
+
+	<Button
+		android:id="@+id/button2"
+		android:layout_width="wrap_content"
+		android:layout_height="28dp"
+		android:layout_below="@id/text"
+		android:layout_toEndOf="@id/button"
+		android:layout_marginBottom="-4dp"
+		android:layout_marginTop="8dp"
+		style="@style/Widget.Mastodon.M3.Button.Text"
+		android:paddingHorizontal="8dp"
+		android:paddingVertical="4dp"
+		android:minWidth="0dp"
+		tools:text="Secondary action"/>
+
+</RelativeLayout>
--- a/mastodon/src/main/res/menu/home.xml
+++ b/mastodon/src/main/res/menu/home.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item
 		android:id="@+id/settings"
-		android:icon="@drawable/ic_fluent_settings_24_regular"
+		android:icon="@drawable/ic_settings_24px"
 		android:showAsAction="always"
 		android:title="@string/settings" />
 </menu>
--- a/mastodon/src/main/res/menu/settings_edit_filter.xml
+++ b/mastodon/src/main/res/menu/settings_edit_filter.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/save" android:showAsAction="always" android:icon="@drawable/ic_save_24px" android:title="@string/save"/>
+</menu>
--- a/mastodon/src/main/res/menu/settings_filter_words.xml
+++ b/mastodon/src/main/res/menu/settings_filter_words.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/select" android:title="@string/enter_selection_mode"/>
+	<item android:id="@+id/select_all" android:title="@string/select_all"/>
+</menu>
--- a/mastodon/src/main/res/menu/settings_filter_words_action_mode.xml
+++ b/mastodon/src/main/res/menu/settings_filter_words_action_mode.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/delete" android:showAsAction="always" android:icon="@drawable/ic_delete_24px" android:title="@string/delete"/>
+</menu>
--- a/mastodon/src/main/res/values-night/styles.xml
+++ b/mastodon/src/main/res/values-night/styles.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Dark"/>
-	<style name="Theme.Mastodon.AutoLightDark.TrueBlack" parent="Theme.Mastodon.Dark.TrueBlack"/>
 </resources>
--- a/mastodon/src/main/res/values/attrs.xml
+++ b/mastodon/src/main/res/values/attrs.xml
@@ -62,4 +62,8 @@
 		<attr name="android:labelTextSize" format="dimension"/>
 		<attr name="labelTextColor" format="color"/>
 	</declare-styleable>
+
+	<declare-styleable name="NestedRecyclerScrollView">
+		<attr name="takePriorityOverChildViews" format="boolean"/>
+	</declare-styleable>
 </resources>
--- a/mastodon/src/main/res/values/ids.xml
+++ b/mastodon/src/main/res/values/ids.xml
@@ -16,4 +16,13 @@
 	<item name="notifications_mentions" type="id"/>

 	<item name="save" type="id"/>
+
+	<item name="list_item_simple" type="id"/>
+	<item name="list_item_simple_tinted" type="id"/>
+	<item name="list_item_switch" type="id"/>
+	<item name="list_item_checkbox" type="id"/>
+	<item name="list_item_radio" type="id"/>
+
+	<item name="server_about" type="id"/>
+	<item name="server_rules" type="id"/>
 </resources>
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -127,7 +127,7 @@
 	<string name="action_vote">Vote</string>
 	<string name="tap_to_reveal">Tap to reveal</string>
 	<string name="delete">Delete</string>
-	<string name="confirm_delete_title">Delete Post</string>
+	<string name="confirm_delete_title">Delete post</string>
 	<string name="confirm_delete">Are you sure you want to delete this post?</string>
 	<string name="deleting">Deleting…</string>
 	<string name="notification_channel_audio_player">Audio playback</string>
@@ -240,8 +240,8 @@
 	</plurals>
 	<string name="media_attachment_unsupported_type">File %s is of an unsupported type</string>
 	<string name="media_attachment_too_big">File %1$s exceeds the size limit of %2$s MB</string>
-	<string name="settings_theme">Visual appearance</string>
-	<string name="theme_auto">Automatic</string>
+	<string name="settings_theme">Appearance</string>
+	<string name="theme_auto">Use device appearance</string>
 	<string name="theme_light">Light</string>
 	<string name="theme_dark">Dark</string>
 	<string name="theme_true_black">True black mode</string>
@@ -503,4 +503,132 @@
 	<string name="report_personal_already_blocked">You’ve already blocked this user, so there’s nothing else you need to do.\n\nThanks for helping keep Mastodon a safe place for everyone!</string>
 	<string name="blocked_user">Blocked %s</string>
 	<string name="mark_all_notifications_read">Mark all as read</string>
+	<string name="settings_display">Display</string>
+	<string name="settings_filters">Filters</string>
+	<string name="settings_privacy"><![CDATA[Privacy & safety]]></string>
+	<string name="settings_server_explanation">Overview, rules, moderators</string>
+	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
+	<string name="about_app">About %s</string>
+	<string name="default_post_language">Default post language</string>
+	<string name="settings_alt_text_reminders">Add alt text reminders</string>
+	<string name="settings_confirm_unfollow">Ask before unfollowing someone</string>
+	<string name="settings_confirm_boost">Ask before boosting</string>
+	<string name="settings_confirm_delete_post">Ask before deleting posts</string>
+	<string name="pause_all_notifications">Pause all</string>
+	<string name="pause_notifications_off">Off</string>
+	<string name="notifications_policy_anyone">Anyone</string>
+	<string name="notifications_policy_followed">People who follow you</string>
+	<string name="notifications_policy_follower">People you follow</string>
+	<string name="notifications_policy_no_one">No one</string>
+	<string name="settings_notifications_policy">Get notifications from</string>
+	<string name="notification_type_mentions_and_replies">Mentions and replies</string>
+	<string name="pause_all_notifications_title">Pause all notifications</string>
+	<plurals name="x_weeks">
+		<item quantity="one">%d week</item>
+		<item quantity="other">%d weeks</item>
+	</plurals>
+	<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
+	<string name="date_at_time">%1$s at %2$s</string>
+	<string name="today">today</string>
+	<string name="yesterday">yesterday</string>
+	<string name="tomorrow">tomorrow</string>
+	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_ends">Ends %s</string>
+	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="pause_notifications_banner">Notifications will resume %s.</string>
+	<string name="resume_notifications_now">Resume now</string>
+	<string name="open_system_notification_settings">Go to notification settings</string>
+	<string name="about_server">About</string>
+	<string name="server_rules">Rules</string>
+	<string name="server_administrator">Administrator</string>
+	<string name="send_email_to_server_admin">Message admin</string>
+	<string name="notifications_disabled_in_system">Turn on notifications from your device settings to see updates from anywhere.</string>
+	<string name="settings_even_more">Even more settings</string>
+	<string name="settings_show_cws">Show content warnings</string>
+	<string name="settings_hide_sensitive_media">Cover up media marked as sensitive</string>
+	<string name="settings_show_interaction_counts">Post interaction counts</string>
+	<string name="settings_show_emoji_in_names">Custom emoji in display names</string>
+	<plurals name="in_x_seconds">
+		<item quantity="one">in %d second</item>
+		<item quantity="other">in %d seconds</item>
+	</plurals>
+	<plurals name="in_x_minutes">
+		<item quantity="one">in %d minute</item>
+		<item quantity="other">in %d minutes</item>
+	</plurals>
+	<plurals name="in_x_hours">
+		<item quantity="one">in %d hour</item>
+		<item quantity="other">in %d hours</item>
+	</plurals>
+	<plurals name="x_hours_ago">
+		<item quantity="one">%d hour ago</item>
+		<item quantity="other">%d hours ago</item>
+	</plurals>
+	<string name="alt_text_reminder_title">Media missing alt text</string>
+	<plurals name="alt_text_reminder_x_images">
+		<item quantity="one">%s of your images is missing alt text. Post anyway?</item>
+		<item quantity="other">%s of your images are missing alt text. Post anyway?</item>
+	</plurals>
+	<plurals name="alt_text_reminder_x_attachments">
+		<item quantity="one">%s of your media attachments is missing alt text. Post anyway?</item>
+		<item quantity="other">%s of your media attachments are missing alt text. Post anyway?</item>
+	</plurals>
+	<string name="count_one">One</string>
+	<string name="count_two">Two</string>
+	<string name="count_three">Three</string>
+	<string name="count_four">Four</string>
+	<string name="alt_text_reminder_post_anyway">Post</string>
+	<!-- %s is the username -->
+	<string name="unfollow_confirmation">Unfollow %s?</string>
+	<string name="filter_active">Active</string>
+	<string name="filter_inactive">Inactive</string>
+	<string name="settings_add_filter">Add filter</string>
+	<string name="settings_edit_filter">Edit filter</string>
+	<string name="settings_filter_duration">Duration</string>
+	<string name="settings_filter_muted_words">Muted words</string>
+	<string name="settings_filter_context">Mute from</string>
+	<string name="settings_filter_show_cw">Show with content warning</string>
+	<string name="settings_filter_show_cw_explanation">Still show posts that match this filter, but behind a content warning</string>
+	<string name="settings_delete_filter">Delete filter</string>
+	<string name="filter_duration_forever">Forever</string>
+	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="settings_filter_ends">Ends %s</string>
+	<plurals name="settings_x_muted_words">
+		<item quantity="one">%d muted word or phrase</item>
+		<item quantity="other">%d muted words or phrases</item>
+	</plurals>
+	<string name="selection_2_options">%1$s and %2$s</string>
+	<string name="selection_3_options">%1$s, %2$s, and %3$s</string>
+	<string name="selection_4_or_more">%1$s, %2$s, and %3$d more</string>
+	<string name="filter_context_home_lists">Home &amp; lists</string>
+	<string name="filter_context_notifications">Notifications</string>
+	<string name="filter_context_public_timelines">Public timelines</string>
+	<string name="filter_context_threads_replies">Threads &amp; replies</string>
+	<string name="filter_context_profiles">Profiles</string>
+	<string name="settings_filter_title">Title</string>
+	<string name="settings_delete_filter_title">Delete filter “%s”?</string>
+	<string name="settings_delete_filter_confirmation">This filter will be deleted from your account on all your devices.</string>
+	<string name="add_muted_word">Add muted word</string>
+	<string name="edit_muted_word">Edit muted word</string>
+	<string name="add">Add</string>
+	<string name="filter_word_or_phrase">Word or phrase</string>
+	<string name="filter_add_word_help">Words are case-insensitive and match full words only.\n\nIf you filter the keyword “Apple,” it will hide posts containing “apple” or “aPpLe” but not “pineapple.”</string>
+	<string name="settings_delete_filter_word">Delete word “%s”?</string>
+	<string name="enter_selection_mode">Select</string>
+	<string name="select_all">Select all</string>
+	<string name="settings_filter_duration_title">Filter duration</string>
+	<string name="filter_duration_custom">Custom</string>
+	<plurals name="settings_delete_x_filter_words">
+		<item quantity="one">Delete %d word?</item>
+		<item quantity="other">Delete %d words?</item>
+	</plurals>
+	<plurals name="x_items_selected">
+		<item quantity="one">%d selected</item>
+		<item quantity="other">%d selected</item>
+	</plurals>
+	<string name="required_form_field_blank">Cannot be blank</string>
+	<string name="filter_word_already_in_list">Already in the list</string>
+	<string name="app_update_ready">App update ready</string>
+	<string name="app_update_version">Version %s</string>
+	<string name="downloading_update">Downloading (%d%%)</string>
 </resources>
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -38,7 +38,11 @@
 		<item name="android:popupMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
 		<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
 		<item name="android:switchStyle">@style/Widget.Mastodon.M3.Switch</item>
-		
+		<item name="android:windowActionModeOverlay">true</item>
+		<item name="android:actionModeBackground">@color/m3_sys_light_primary</item>
+		<item name="android:actionModeStyle">@style/Widget.Mastodon.Toolbar.ActionMode</item>
+		<item name="android:actionModeCloseDrawable">@drawable/ic_actionmode_close</item>
+
 		<!-- M3 colors -->
 		<item name="colorM3Primary">@color/m3_sys_light_primary</item>
 		<item name="colorM3OnPrimary">@color/m3_sys_light_on_primary</item>
@@ -120,6 +124,10 @@
 		<item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
 		<item name="android:popupMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
 		<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
+		<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:actionModeCloseDrawable">@drawable/ic_actionmode_close</item>

 		<!-- M3 colors -->
 		<item name="colorM3Primary">@color/m3_sys_dark_primary</item>
@@ -170,12 +178,6 @@
 		<item name="colorM3OnSurface">#FFF</item>
 	</style>

-	<style name="Theme.Mastodon.Dark.TrueBlack">
-		<item name="colorWindowBackground">#000</item>
-
-		<item name="colorM3Background">#000</item>
-	</style>
-
 	<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Light"/>
 	<style name="Theme.Mastodon.AutoLightDark.TrueBlack" parent="Theme.Mastodon.Light"/>

@@ -189,6 +191,14 @@
 		<item name="actionBarIconTint">@color/action_bar_icons</item>
 	</style>

+	<style name="Widget.Mastodon.Toolbar.ActionMode" parent="android:Widget.Material.ActionMode">
+		<item name="android:titleTextStyle">@style/action_mode_title</item>
+	</style>
+
+	<style name="action_mode_title" parent="android:TextAppearance.Material.Widget.ActionMode.Title">
+		<item name="android:textColor">?colorM3OnPrimary</item>
+	</style>
+
 	<style name="Widget.Mastodon.Toolbar" parent="android:Widget.Material.Toolbar">
 		<item name="android:contentInsetStartWithNavigation">0dp</item>
 		<item name="android:titleMarginEnd">0dp</item>
@@ -303,7 +313,7 @@
 		<item name="android:minWidth">0px</item>
 		<item name="android:background">@drawable/bg_alert_button</item>
 		<item name="android:textAppearance">@style/m3_label_large</item>
-		<item name="android:textColor">?colorM3Primary</item>
+		<item name="android:textColor">@color/button_text_m3_text</item>
 	</style>

 	<style name="Widget.Mastodon.PopupMenu" parent="android:Widget.Material.Light.PopupMenu">
@@ -411,6 +421,8 @@
 		<item name="android:textSize">24dp</item>
 		<item name="android:minHeight">38dp</item>
 		<item name="android:gravity">bottom</item>
+		<item name="android:maxLines">2</item>
+		<item name="android:singleLine">false</item>
 	</style>

 	<style name="m3_body_large">
--- a/mastodon/src/main/res/values/urls.xml
+++ b/mastodon/src/main/res/values/urls.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="github_url" translatable="false">https://github.com/mastodon/mastodon-android</string>
+	<string name="privacy_policy_url" translatable="false">https://joinmastodon.org/privacy-policy</string>
+</resources>