Implement new Material3 spec.

2026-04-27 12:15:50 +01:00 · 2022-05-26 17:32:52 -03:00
parent 556e480b06
commit 1b471e163d
374 changed files with 3219 additions and 3049 deletions
--- a/app/src/main/res/drawable/archived_indicator_background.xml
+++ b/app/src/main/res/drawable/archived_indicator_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="@color/core_grey_45"/>
+    <solid android:color="@color/signal_colorOnSurfaceVariant"/>
    <corners android:radius="10dp"/>
 </shape>
--- a/app/src/main/res/drawable/compose_background.xml
+++ b/app/src/main/res/drawable/compose_background.xml
@@ -4,7 +4,7 @@
    android:shape="rectangle">

    <solid
-        android:color="#b4e9e9e9" />
+        android:color="@color/signal_colorSurfaceVariant" />

    <corners
        android:radius="20dp" />
--- a/app/src/main/res/drawable/compose_background_wallpaper.xml
+++ b/app/src/main/res/drawable/compose_background_wallpaper.xml
@@ -4,7 +4,7 @@
    android:shape="rectangle">

    <solid
-        android:color="@color/core_white" />
+        android:color="@color/signal_colorTransparent5" />

    <corners
        android:radius="20dp" />
--- a/app/src/main/res/drawable/contact_selection_checkbox.xml
+++ b/app/src/main/res/drawable/contact_selection_checkbox.xml
@@ -4,8 +4,8 @@
        <layer-list>
            <item>
                <shape android:shape="oval">
-                    <solid android:color="@color/core_grey_25" />
-                    <stroke android:width="2dp" android:color="@color/white" />
+                    <solid android:color="@color/signal_colorOutline" />
+                    <stroke android:width="1.5dp" android:color="@color/signal_colorOnPrimary" />
                </shape>
            </item>
            <item android:drawable="@drawable/ic_check_outline_22" />
@@ -15,7 +15,7 @@
        <layer-list>
            <item>
                <shape android:shape="oval">
-                    <solid android:color="@color/core_ultramarine" />
+                    <solid android:color="@color/signal_colorPrimary" />
                </shape>
            </item>
            <item android:drawable="@drawable/ic_check_outline_22" />
@@ -23,7 +23,7 @@
    </item>
    <item android:state_checked="false">
        <shape android:shape="oval">
-            <stroke android:width="2dp" android:color="@color/core_grey_25" />
+            <stroke android:width="1.5dp" android:color="@color/signal_colorOutline" />
        </shape>
    </item>
 </selector>
--- a/app/src/main/res/drawable/conversation_list_item_background.xml
+++ b/app/src/main/res/drawable/conversation_list_item_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
-    <item android:drawable="@color/core_ultramarine_33" android:state_pressed="true" />
-    <item android:drawable="@color/core_ultramarine_50" android:state_focused="true" />
+    <item android:drawable="@color/signal_colorSurface2" android:state_selected="true" />
+    <item android:drawable="@color/signal_colorSurface2" android:state_pressed="true" />
+    <item android:drawable="@color/signal_colorSurface3" android:state_focused="true" />
    <item android:drawable="@drawable/conversation_list_item_background_default" />
 </selector>
--- a/app/src/main/res/drawable/conversation_reaction_overlay_background.xml
+++ b/app/src/main/res/drawable/conversation_reaction_overlay_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/core_white" />
+    <solid android:color="@color/signal_colorSurface2" />
    <corners android:radius="30dp" />
 </shape>
--- a/app/src/main/res/drawable/conversation_tab_icon_background.xml
+++ b/app/src/main/res/drawable/conversation_tab_icon_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
-    <solid android:color="@color/signal_colorPrimaryContainer" />
+    <solid android:color="@color/signal_colorSecondaryContainer" />
    <corners android:radius="18dp" />
 </shape>
--- a/app/src/main/res/drawable/dismiss_background.xml
+++ b/app/src/main/res/drawable/dismiss_background.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="oval" >
-    <solid android:color="#99ffffff" />
-</shape>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="22dp"
+    android:insetTop="8dp"
+    android:insetRight="8dp"
+    android:insetBottom="22dp">
+    <shape android:shape="oval">
+        <solid android:color="@color/signal_colorSurface_60" />
+    </shape>
+</inset>
+
--- a/app/src/main/res/drawable/group_link_admin_approval_border.xml
+++ b/app/src/main/res/drawable/group_link_admin_approval_border.xml
@@ -4,6 +4,6 @@
    <corners android:radius="8dp" />

    <stroke
-        android:width="1dp"
-        android:color="@color/core_grey_05" />
+        android:width="1.5dp"
+        android:color="@color/signal_colorOutline" />
 </shape>
--- a/app/src/main/res/drawable/ic_any_emoji_32.xml
+++ b/app/src/main/res/drawable/ic_any_emoji_32.xml
@@ -5,14 +5,14 @@
    android:viewportHeight="32">
  <path
      android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
-      android:fillColor="@color/core_grey_05"/>
+      android:fillColor="@color/reactions_overlay_any_emoji_background"/>
  <path
      android:pathData="M8,16m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="@color/core_grey_45"/>
+      android:fillColor="@color/reactions_overlay_any_emoji_foreground"/>
  <path
      android:pathData="M16,16m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="@color/core_grey_45"/>
+      android:fillColor="@color/reactions_overlay_any_emoji_foreground"/>
  <path
      android:pathData="M24,16m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="@color/core_grey_45"/>
+      android:fillColor="@color/reactions_overlay_any_emoji_foreground"/>
 </vector>
--- a/app/src/main/res/drawable/ic_check_outline_22.xml
+++ b/app/src/main/res/drawable/ic_check_outline_22.xml
@@ -5,5 +5,5 @@
    android:viewportHeight="22">
  <path
      android:pathData="M15.773,7.338L16.834,8.4L9.232,16L5.171,11.939L6.232,10.879L9.232,13.879L15.773,7.338Z"
-      android:fillColor="@color/white"/>
+      android:fillColor="@color/signal_colorOnPrimary"/>
 </vector>
--- a/app/src/main/res/drawable/ic_contact_circle_outline_32.xml
+++ b/app/src/main/res/drawable/ic_contact_circle_outline_32.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M16,1A15,15 0,1 0,31 16,15 15,0 0,0 16,1ZM16,29.5a13.43,13.43 0,0 1,-9.73 -4.17A7.19,7.19 0,0 1,13 20.75h1.22a6.82,6.82 0,0 0,3.66 0h1.22a7.19,7.19 0,0 1,6.68 4.58A13.43,13.43 0,0 1,16 29.5ZM10.5,14A5.5,5.5 0,1 1,16 19.5,5.5 5.5,0 0,1 10.5,14ZM20.5,19.38a7,7 0,1 0,-9 0A8.67,8.67 0,0 0,5.2 24.06,13.38 13.38,0 0,1 2.5,16a13.5,13.5 0,0 1,27 0,13.38 13.38,0 0,1 -2.7,8.06A8.67,8.67 0,0 0,20.48 19.38Z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_contact_outline_24.xml
+++ b/app/src/main/res/drawable/ic_contact_outline_24.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:pathData="M12,1C9.824,1 7.698,1.645 5.889,2.854C4.08,4.063 2.67,5.78 1.837,7.79C1.005,9.8 0.787,12.012 1.211,14.146C1.636,16.28 2.683,18.24 4.222,19.778C5.76,21.317 7.72,22.364 9.854,22.789C11.988,23.213 14.2,22.995 16.209,22.163C18.219,21.33 19.938,19.92 21.146,18.111C22.355,16.302 23,14.176 23,12C23,9.083 21.841,6.285 19.778,4.222C17.715,2.159 14.917,1 12,1V1ZM12,2.5C13.762,2.496 15.49,2.984 16.991,3.908C18.491,4.832 19.704,6.155 20.494,7.73C21.284,9.305 21.62,11.069 21.463,12.824C21.306,14.579 20.663,16.256 19.607,17.666C19.062,17.01 18.383,16.478 17.615,16.106C16.847,15.734 16.009,15.531 15.156,15.51C16.354,14.175 17.012,12.441 17,10.647C17,7.333 14.761,5 12,5C9.239,5 7,7.333 7,10.647C6.988,12.441 7.646,14.175 8.844,15.51C7.991,15.531 7.153,15.734 6.385,16.106C5.617,16.478 4.938,17.01 4.393,17.666C3.336,16.256 2.694,14.579 2.537,12.824C2.38,11.069 2.716,9.305 3.506,7.73C4.296,6.155 5.509,4.832 7.009,3.908C8.51,2.984 10.238,2.496 12,2.5V2.5ZM8.5,10.647C8.5,8.283 10.005,6.5 12,6.5C13.995,6.5 15.5,8.283 15.5,10.647C15.5,13.187 13.832,15.5 12,15.5C10.168,15.5 8.5,13.187 8.5,10.647ZM5.408,18.825C5.822,18.261 6.363,17.802 6.987,17.485C7.611,17.168 8.3,17.002 9,17H15C15.7,17.002 16.389,17.168 17.013,17.485C17.637,17.802 18.178,18.261 18.592,18.825C16.826,20.54 14.462,21.5 12,21.5C9.538,21.5 7.174,20.54 5.408,18.825V18.825Z"
+      android:fillColor="#000000"/>
+</vector>
--- a/app/src/main/res/drawable/ic_copy_24_solid_tinted.xml
+++ b/app/src/main/res/drawable/ic_copy_24_solid_tinted.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/signal_icon_tint_primary"
-        android:pathData="M21,5V15a3,3 0,0 1,-3 3H11a3,3 0,0 1,-3 -3V5a3,3 0,0 1,3 -3h7A3,3 0,0 1,21 5ZM11,19.5A4.505,4.505 0,0 1,6.5 15V6H6A3,3 0,0 0,3 9V19a3,3 0,0 0,3 3h7a3,3 0,0 0,2.95 -2.5Z" />
-</vector>
--- a/app/src/main/res/drawable/ic_copy_24_tinted.xml
+++ b/app/src/main/res/drawable/ic_copy_24_tinted.xml
@@ -1,10 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/signal_icon_tint_primary"
-        android:pathData="M15.95,19.5A3,3 0,0 1,13 22H6a3,3 0,0 1,-3 -3V9A3,3 0,0 1,6 6h0.5V7.5H6A1.5,1.5 0,0 0,4.5 9V19A1.5,1.5 0,0 0,6 20.5h7a1.5,1.5 0,0 0,1.408 -1ZM18,3.5H11A1.5,1.5 0,0 0,9.5 5V15A1.5,1.5 0,0 0,11 16.5h7A1.5,1.5 0,0 0,19.5 15V5A1.5,1.5 0,0 0,18 3.5M18,2a3,3 0,0 1,3 3V15a3,3 0,0 1,-3 3H11a3,3 0,0 1,-3 -3V5a3,3 0,0 1,3 -3Z" />
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/signal_colorOnSurface" android:pathData="M15.95,19.5A3,3 0,0 1,13 22H6a3,3 0,0 1,-3 -3V9A3,3 0,0 1,6 6h0.5V7.5H6A1.5,1.5 0,0 0,4.5 9V19A1.5,1.5 0,0 0,6 20.5h7a1.5,1.5 0,0 0,1.408 -1ZM18,3.5H11A1.5,1.5 0,0 0,9.5 5V15A1.5,1.5 0,0 0,11 16.5h7A1.5,1.5 0,0 0,19.5 15V5A1.5,1.5 0,0 0,18 3.5M18,2a3,3 0,0 1,3 3V15a3,3 0,0 1,-3 3H11a3,3 0,0 1,-3 -3V5a3,3 0,0 1,3 -3Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_file_outline_24.xml
+++ b/app/src/main/res/drawable/ic_file_outline_24.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="#FF000000"
+      android:pathData="M18.93,9.36 L12.61,3.05a2.3,2.3 0,0 0,-1.93 -1L6.32,2.05A2.32,2.32 0,0 0,4 4.32L4,19.67A2.32,2.32 0,0 0,6.32 22L17.66,22A2.33,2.33 0,0 0,20 19.67L20,11.3A2.33,2.33 0,0 0,18.93 9.36ZM13,5.2l0.68,1 2.08,2.09 1,0.67h-3A0.82,0.82 0,0 1,13 8.16L13,6.25h0ZM18.48,19.67a0.82,0.82 0,0 1,-0.82 0.82L6.32,20.49a0.82,0.82 0,0 1,-0.82 -0.82L5.5,4.32a0.82,0.82 0,0 1,0.82 -0.82h4.36a0.75,0.75 0,0 1,0.48 0.18l0,0L11.4,4a0.75,0.75 0,0 1,0.1 0.36L11.5,8.16a2.32,2.32 0,0 0,2.32 2.32h3.84a0.74,0.74 0,0 1,0.36 0.09l0.1,0.1 0,0a0.81,0.81 0,0 1,0.34 0.65Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_file_outline_32.xml
+++ b/app/src/main/res/drawable/ic_file_outline_32.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M26.05,12.82l-10,-10A3,3 0,0 0,14 2H8A3,3 0,0 0,5 5V27a3,3 0,0 0,3 3H24a3,3 0,0 0,3 -3V15A3,3 0,0 0,26.05 12.82ZM17,5.68 L23.32,12H18.5A1.5,1.5 0,0 1,17 10.5ZM25.5,27A1.5,1.5 0,0 1,24 28.5H8A1.5,1.5 0,0 1,6.5 27V5A1.5,1.5 0,0 1,8 3.5h6A1.5,1.5 0,0 1,15.5 5v5.5a3,3 0,0 0,3 3H24A1.5,1.5 0,0 1,25.5 15Z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_gallery_outline_24.xml
+++ b/app/src/main/res/drawable/ic_gallery_outline_24.xml
--- a/app/src/main/res/drawable/ic_group_outline_new_28.xml
+++ b/app/src/main/res/drawable/ic_group_outline_new_28.xml
@@ -4,6 +4,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="@color/signal_inverse_primary"
+        android:fillColor="@color/signal_colorOnSecondaryContainer"
        android:pathData="M19.513,9.942a4.25,4.25 0,1 0,-6.538 -0.013,4.749 4.749,0 0,0 -1.336,0.618 4.242,4.242 0,1 0,-7.152 4.395A4.744,4.744 0,0 0,1 19.5L1,21L2.5,21L2.5,19.5a3.254,3.254 0,0 1,3.25 -3.25h4A3.254,3.254 0,0 1,13 19.5L13,21h1.5L14.5,19.5a4.744,4.744 0,0 0,-3.487 -4.558A4.21,4.21 0,0 0,12 12.25c0,-0.029 -0.008,-0.055 -0.008,-0.083a3.259,3.259 0,0 1,2.258 -0.917h4A3.254,3.254 0,0 1,21.5 14.5L21.5,16L23,16L23,14.5A4.744,4.744 0,0 0,19.513 9.942ZM7.75,15a2.75,2.75 0,1 1,2.75 -2.75A2.75,2.75 0,0 1,7.75 15ZM16.25,10A2.75,2.75 0,1 1,19 7.25,2.75 2.75,0 0,1 16.25,10Z" />
 </vector>
--- a/app/src/main/res/drawable/ic_invite_circle.xml
+++ b/app/src/main/res/drawable/ic_invite_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item>
        <shape android:shape="oval">
-            <solid android:color="@color/core_grey_05" />
+            <solid android:color="@color/signal_colorSurfaceVariant" />
        </shape>
    </item>
    <item
--- a/app/src/main/res/drawable/ic_invite_inverse_28.xml
+++ b/app/src/main/res/drawable/ic_invite_inverse_28.xml
@@ -4,19 +4,19 @@
    android:viewportWidth="28"
    android:viewportHeight="28">
    <path
-        android:fillColor="@color/signal_inverse_primary"
+        android:fillColor="@color/signal_colorOnSurfaceVariant"
        android:fillType="evenOdd"
        android:pathData="M14,2c7.429,0 13,4.875 13,11.143A10.3,10.3 0,0 1,23.791 20.6l0.662,4.47c0,0.012 0,0.024 0,0.035a0.348,0.348 0,0 1,-0.348 0.349,0.377 0.377,0 0,1 -0.113,-0.02l-0.059,-0.028 -4.547,-2.064A15.4,15.4 0,0 1,14 24.286c-7.429,0 -13,-4.875 -13,-11.143S6.571,2 14,2m0,1.5C7.444,3.5 2.5,7.646 2.5,13.143S7.444,22.786 14,22.786a13.872,13.872 0,0 0,4.864 -0.849l0.58,-0.217 0.565,0.256 2.647,1.2 -0.349,-2.359 -0.113,-0.76 0.552,-0.536a8.743,8.743 0,0 0,2.754 -6.38C25.5,7.646 20.556,3.5 14,3.5" />
    <path
-        android:fillColor="@color/signal_inverse_primary"
+        android:fillColor="@color/signal_colorOnSurfaceVariant"
        android:fillType="evenOdd"
        android:pathData="M20,12a1.5,1.5 0,1 1,-1.5 1.5A1.5,1.5 0,0 1,20 12" />
    <path
-        android:fillColor="@color/signal_inverse_primary"
+        android:fillColor="@color/signal_colorOnSurfaceVariant"
        android:fillType="evenOdd"
        android:pathData="M14,12a1.5,1.5 0,1 1,-1.5 1.5A1.5,1.5 0,0 1,14 12" />
    <path
-        android:fillColor="@color/signal_inverse_primary"
+        android:fillColor="@color/signal_colorOnSurfaceVariant"
        android:fillType="evenOdd"
        android:pathData="M8,12a1.5,1.5 0,1 1,-1.5 1.5A1.5,1.5 0,0 1,8 12" />
 </vector>
--- a/app/src/main/res/drawable/ic_location_outline_24.xml
+++ b/app/src/main/res/drawable/ic_location_outline_24.xml
@@ -0,0 +1,10 @@
+<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="M21.5,12C21.5,17.247 17.247,21.5 12,21.5C6.753,21.5 2.5,17.247 2.5,12C2.5,6.753 6.753,2.5 12,2.5C17.247,2.5 21.5,6.753 21.5,12ZM23,12C23,18.075 18.075,23 12,23C5.925,23 1,18.075 1,12C1,5.925 5.925,1 12,1C18.075,1 23,5.925 23,12ZM7.303,11.929L15.585,8.415L12.071,16.697L11.217,13.492C11.124,13.146 10.854,12.876 10.508,12.783L7.303,11.929ZM17.449,7.862C17.8,7.034 16.965,6.2 16.138,6.551L5.377,11.116C4.501,11.488 4.59,12.758 5.51,13.003L9.842,14.158L10.997,18.49C11.242,19.41 12.512,19.499 12.884,18.623L17.449,7.862Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
--- a/app/src/main/res/drawable/ic_location_outline_32.xml
+++ b/app/src/main/res/drawable/ic_location_outline_32.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M16,2.5A13.5,13.5 0,1 1,2.5 16,13.52 13.52,0 0,1 16,2.5M16,1A15,15 0,1 0,31 16,15 15,0 0,0 16,1ZM21.71,10.29L16.26,23l-1.58,-4.74 -0.24,-0.71 -0.71,-0.24L9,15.74l12.72,-5.45M16.8,24.54h0M23.09,8.21a2.3,2.3 0,0 0,-0.82 0.2L7.19,14.88c-1.33,0.57 -1.3,1.41 0.08,1.87l6,2 2,6c0.24,0.7 0.57,1.06 0.92,1.06s0.67,-0.33 0.95,-1L23.59,9.73c0.4,-1 0.17,-1.52 -0.5,-1.52Z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_new_group_circle.xml
+++ b/app/src/main/res/drawable/ic_new_group_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item>
        <shape android:shape="oval">
-            <solid android:color="@color/core_grey_05" />
+            <solid android:color="@color/signal_colorSurfaceVariant" />
        </shape>
    </item>
    <item
--- a/app/src/main/res/drawable/ic_payments_32.xml
+++ b/app/src/main/res/drawable/ic_payments_32.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M26.7,4.7H5.3A4.3,4.3 0,0 0,1 9V23a4.3,4.3 0,0 0,4.3 4.3H26.7A4.3,4.3 0,0 0,31 23V9a4.3,4.3 0,0 0,-4.3 -4.3ZM2.6,11.9V9A2.6,2.6 0,0 1,5.3 6.4H26.7A2.6,2.6 0,0 1,29.4 9v2.9ZM5.3,25.6A2.6,2.6 0,0 1,2.6 23V15.1H29.4V23a2.6,2.6 0,0 1,-2.7 2.6Z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_photo_album_24.xml
+++ b/app/src/main/res/drawable/ic_photo_album_24.xml
@@ -1,9 +0,0 @@
-<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="#FF000000"
-      android:pathData="M5,17.5a3,3 0,0 1,-3 -3L2,5A3,3 0,0 1,5 2h9.5a3,3 0,0 1,3 3L16,5a1.5,1.5 0,0 0,-1.5 -1.5L5,3.5A1.5,1.5 0,0 0,3.5 5v9.5A1.5,1.5 0,0 0,5 16ZM22,9.5L22,19a3,3 0,0 1,-3 3L9.5,22a3,3 0,0 1,-3 -3L6.5,9.5a3,3 0,0 1,3 -3L19,6.5A3,3 0,0 1,22 9.5ZM8,9.5v4.75l0.62,-0.93 3.14,-3.15 3.5,3.51 2.5,-2.51 2.06,2.06 0.68,1L20.5,9.5A1.5,1.5 0,0 0,19 8L9.5,8A1.5,1.5 0,0 0,8 9.5ZM20.5,19L20.5,16L17.76,13.3l-1.44,1.44L17.54,16 16.48,17 11.76,12.3 8,16.06L8,19a1.5,1.5 0,0 0,1.5 1.5L19,20.5A1.5,1.5 0,0 0,20.5 19Z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_photo_album_outline_32.xml
+++ b/app/src/main/res/drawable/ic_photo_album_outline_32.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M6.5,24L6,24a4,4 0,0 1,-4 -4L2,6A4,4 0,0 1,6 2L20,2a4,4 0,0 1,4 4v0.5L22.5,6.5L22.5,6A2.5,2.5 0,0 0,20 3.5L6,3.5A2.5,2.5 0,0 0,3.5 6L3.5,20A2.5,2.5 0,0 0,6 22.5h0.5ZM30,12L30,26a4,4 0,0 1,-4 4L12,30a4,4 0,0 1,-4 -4L8,12a4,4 0,0 1,4 -4L26,8A4,4 0,0 1,30 12ZM9.5,12v8.25l0.66,-1 5.59,-5.57 4.75,4.75 3.24,-3.24 4.19,4.2 0.57,0.85L28.5,12A2.5,2.5 0,0 0,26 9.5L12,9.5A2.5,2.5 0,0 0,9.5 12ZM28.5,26L28.5,22.09l-4.76,-4.77L21.56,19.5l1.72,1.72 -1.06,1.06 -6.47,-6.47L9.5,22v4A2.5,2.5 0,0 0,12 28.5L26,28.5A2.5,2.5 0,0 0,28.5 26Z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_trash_24_solid_tinted.xml
+++ b/app/src/main/res/drawable/ic_trash_24_solid_tinted.xml
@@ -1,9 +0,0 @@
-<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="@color/signal_icon_tint_primary"
-      android:pathData="M16.38,4.5a4.49,4.49 0,0 0,-8.76 0L2,4.5L2,6L3.5,6L4.86,20A2.25,2.25 0,0 0,7.1 22h9.8a2.25,2.25 0,0 0,2.24 -2L20.5,6L22,6L22,4.5ZM12,2.5a3,3 0,0 1,2.82 2L9.18,4.5A3,3 0,0 1,12 2.5ZM8,18 L7.5,8L9,8l0.5,10ZM12.75,18h-1.5L11.25,8h1.5ZM16,18L14.5,18L15,8h1.5Z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_x_24.xml
+++ b/app/src/main/res/drawable/ic_x_24.xml
@@ -4,6 +4,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="@color/signal_icon_tint_action"
+      android:fillColor="@color/signal_colorOnSurface"
      android:pathData="M19.53,5.53l-1.06,-1.06l-6.47,6.469l-6.47,-6.469l-1.06,1.06l6.469,6.47l-6.469,6.47l1.06,1.06l6.47,-6.469l6.47,6.469l1.06,-1.06l-6.469,-6.47l6.469,-6.47z"/>
 </vector>
--- a/app/src/main/res/drawable/icon_button_squircle.xml
+++ b/app/src/main/res/drawable/icon_button_squircle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
-    <solid android:color="@color/signal_background_secondary" />
+    <solid android:color="@color/signal_colorSecondaryContainer" />
    <corners android:radius="18dp" />
 </shape>
--- a/app/src/main/res/drawable/multiselect_empty_ring.xml
+++ b/app/src/main/res/drawable/multiselect_empty_ring.xml
@@ -4,7 +4,7 @@
    android:shape="oval">

    <stroke
-        android:width="2dp"
-        android:color="@color/core_grey_25" />
+        android:width="1.5dp"
+        android:color="@color/signal_colorOutline" />

 </shape>
--- a/app/src/main/res/drawable/new_notification_profile_pref_icon.xml
+++ b/app/src/main/res/drawable/new_notification_profile_pref_icon.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item>
        <shape android:shape="oval">
-            <solid android:color="@color/signal_background_dialog_secondary" />
+            <solid android:color="@color/signal_colorSurfaceVariant" />
            <padding android:right="12dp" android:bottom="12dp" android:top="12dp" android:left="12dp" />
            <padding android:right="12dp" android:bottom="12dp" android:top="12dp" android:left="12dp" />
        </shape>
--- a/app/src/main/res/drawable/notification_entry_pref_background.xml
+++ b/app/src/main/res/drawable/notification_entry_pref_background.xml
@@ -2,26 +2,26 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="true" android:state_selected="true">
        <shape android:shape="rectangle">
-            <solid android:color="@color/signal_background_dialog_secondary" />
-            <stroke android:color="@color/signal_accent_primary" android:width="1.5dp" />
+            <solid android:color="@color/signal_colorOutline_38" />
+            <stroke android:color="@color/signal_colorPrimary" android:width="1.5dp" />
            <corners android:radius="18dp" />
        </shape>
    </item>
    <item android:state_selected="true">
        <shape android:shape="rectangle">
-            <stroke android:color="@color/signal_accent_primary" android:width="1.5dp" />
+            <stroke android:color="@color/signal_colorPrimary" android:width="1.5dp" />
            <corners android:radius="18dp" />
        </shape>
    </item>
    <item android:state_pressed="true">
        <shape android:shape="rectangle">
-            <solid android:color="@color/signal_background_dialog_secondary" />
+            <solid android:color="@color/signal_colorOutline_38" />
            <corners android:radius="18dp" />
        </shape>
    </item>
    <item>
        <shape android:shape="rectangle">
-            <stroke android:color="@color/signal_background_dialog_secondary" android:width="1.5dp" />
+            <stroke android:color="@color/signal_colorOutline_38" android:width="1.5dp" />
            <corners android:radius="18dp" />
        </shape>
    </item>
--- a/app/src/main/res/drawable/progress_button_state.xml
+++ b/app/src/main/res/drawable/progress_button_state.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-          android:color="@color/core_ultramarine"/>
-    <item android:state_focused="true"
-          android:color="@color/core_ultramarine"/>
-    <item android:state_enabled="false"
-          android:color="@color/core_ultramarine"/>
-    <item android:state_enabled="true"
-          android:color="@color/core_ultramarine"/>
-</selector>
--- a/app/src/main/res/drawable/progress_button_state_red.xml
+++ b/app/src/main/res/drawable/progress_button_state_red.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-          android:color="@color/core_red"/>
-    <item android:state_focused="true"
-          android:color="@color/core_red"/>
-    <item android:state_enabled="false"
-          android:color="@color/core_red"/>
-    <item android:state_enabled="true"
-          android:color="@color/core_red"/>
-</selector>
--- a/app/src/main/res/drawable/reaction_pill_background.xml
+++ b/app/src/main/res/drawable/reaction_pill_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="1000dp" />
-    <solid android:color="@color/core_grey_05" />
-    <stroke android:color="@color/white" android:width="1dp" />
+    <solid android:color="@color/signal_colorSurfaceVariant" />
+    <stroke android:color="@color/signal_colorBackground" android:width="1dp" />
 </shape>
--- a/app/src/main/res/drawable/recycler_view_fast_scroller_bubble.xml
+++ b/app/src/main/res/drawable/recycler_view_fast_scroller_bubble.xml
@@ -4,6 +4,6 @@
             android:topRightRadius="44dp"
             android:bottomLeftRadius="44dp"
             android:bottomRightRadius="0dp"/>
-    <solid android:color="@color/signal_accent_primary" />
+    <solid android:color="@color/signal_colorPrimary" />
    <size android:height="88dp" android:width="88dp" />
 </shape>
--- a/app/src/main/res/drawable/recycler_view_fast_scroller_handle.xml
+++ b/app/src/main/res/drawable/recycler_view_fast_scroller_handle.xml
@@ -3,14 +3,14 @@
    <item android:state_selected="true">
        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
            <corners android:radius="2dp"/>
-            <solid android:color="@color/signal_accent_primary"/>
+            <solid android:color="@color/signal_colorPrimary"/>
            <size android:height="32dp" android:width="4dp"/>
        </shape>
    </item>
    <item>
        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
            <corners android:radius="2dp"/>
-            <solid android:color="@color/signal_inverse_primary"/>
+            <solid android:color="@color/signal_colorPrimary"/>
            <size android:height="32dp" android:width="4dp"/>
        </shape>
    </item>
--- a/app/src/main/res/drawable/rounded_outline_12.xml
+++ b/app/src/main/res/drawable/rounded_outline_12.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/signal_colorSurface" />
+    <stroke android:color="@color/signal_colorOutline" android:width="1dp" />
+    <corners android:radius="12dp" />
+</shape>
--- a/app/src/main/res/drawable/rounded_rectangle_surface_2_18.xml
+++ b/app/src/main/res/drawable/rounded_rectangle_surface_2_18.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/signal_colorSurface2"/>
+    <corners android:radius="18dp"/>
+</shape>
--- a/app/src/main/res/drawable/rounded_rectangle_surface_variant.xml
+++ b/app/src/main/res/drawable/rounded_rectangle_surface_variant.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/signal_colorSurfaceVariant"/>
+    <corners android:radius="30dp"/>
+</shape>
--- a/app/src/main/res/drawable/rounded_rectangle_surface_variant_32.xml
+++ b/app/src/main/res/drawable/rounded_rectangle_surface_variant_32.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/signal_colorSurfaceVariant"/>
+    <corners android:radius="32dp"/>
+</shape>
--- a/app/src/main/res/drawable/search_toolbar_background.xml
+++ b/app/src/main/res/drawable/search_toolbar_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/signal_colorSurfaceVariant" />
+    <corners android:radius="32dp" />
+</shape>
--- a/app/src/main/res/drawable/selectable_icon_button.xml
+++ b/app/src/main/res/drawable/selectable_icon_button.xml
@@ -5,7 +5,7 @@
            <item android:drawable="@drawable/icon_button_squircle" />
            <item>
                <shape android:shape="rectangle">
-                    <solid android:color="@color/signal_inverse_transparent_10" />
+                    <solid android:color="@color/signal_colorSecondaryContainer_12" />
                    <corners android:radius="18dp" />
                </shape>
            </item>
--- a/app/src/main/res/drawable/signal_bottom_action_bar_background.xml
+++ b/app/src/main/res/drawable/signal_bottom_action_bar_background.xml
@@ -4,6 +4,6 @@
    android:shape="rectangle">

    <corners android:radius="@dimen/signal_context_menu_corner_radius" />
-    <solid android:color="@color/signal_background_dialog" />
+    <solid android:color="@color/signal_colorSurface2" />

 </shape>
--- a/app/src/main/res/drawable/signal_context_menu_background.xml
+++ b/app/src/main/res/drawable/signal_context_menu_background.xml
@@ -4,6 +4,6 @@
    android:shape="rectangle">

    <corners android:radius="@dimen/signal_context_menu_corner_radius" />
-    <solid android:color="@color/signal_background_dialog" />
+    <solid android:color="@color/signal_colorSurface2" />

 </shape>
--- a/app/src/main/res/drawable/sticky_date_header_background.xml
+++ b/app/src/main/res/drawable/sticky_date_header_background.xml
@@ -3,6 +3,6 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">

-    <corners android:radius="4dp" />
-    <solid android:color="@color/core_grey_02" />
+    <corners android:radius="14dp" />
+    <solid android:color="@color/signal_colorSurface1" />
 </shape>
--- a/app/src/main/res/drawable/sticky_date_header_background_wallpaper.xml
+++ b/app/src/main/res/drawable/sticky_date_header_background_wallpaper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="14dp" />
+    <solid android:color="@color/wallpaper_bubble_color" />
+</shape>
--- a/app/src/main/res/drawable/unread_count_background.xml
+++ b/app/src/main/res/drawable/unread_count_background.xml
@@ -5,10 +5,10 @@

    <corners android:radius="@dimen/unread_count_bubble_radius" />

-    <solid android:color="@color/core_ultramarine" />
+    <solid android:color="@color/signal_colorPrimary" />

    <stroke
-        android:color="@color/core_white"
+        android:color="@color/signal_colorOnPrimary"
        android:width="1dp"/>

 </shape>
--- a/app/src/main/res/drawable/unread_count_background_new.xml
+++ b/app/src/main/res/drawable/unread_count_background_new.xml
@@ -4,5 +4,5 @@
    android:shape="rectangle">

    <corners android:radius="@dimen/unread_count_bubble_radius" />
-    <solid android:color="@color/core_ultramarine" />
+    <solid android:color="@color/signal_colorPrimary" />
 </shape>
--- a/app/src/main/res/drawable/wallpaper_bubble_background_18.xml
+++ b/app/src/main/res/drawable/wallpaper_bubble_background_18.xml
@@ -4,5 +4,5 @@
    android:shape="rectangle">

  <solid android:color="@color/wallpaper_bubble_color" />
-  <corners android:radius="8dp" />
+  <corners android:radius="18dp" />
 </shape>