Merge branch 'dev' into session-restore

5 years ago · e3c54c21d1
parent 97cde203ca 299d81f4dc
commit e3c54c21d1
373 changed files with 14754 additions and 7391 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@ -98,7 +98,7 @@
        android:largeHeap="true"
        android:networkSecurityConfig="@xml/network_security_configuration"
        android:supportsRtl="true"
-        android:theme="@style/TextSecure.DarkTheme"
+        android:theme="@style/Session.DarkTheme"
        tools:replace="android:allowBackup">

        <meta-data
@ -124,7 +124,62 @@
            android:name="firebase_messaging_auto_init_enabled"
            android:value="false" />

-        <activity android:name="org.thoughtcrime.securesms.loki.LinkedDevicesActivity" />
+        <!-- Session -->
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.LandingActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.RegisterActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.RestoreActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.LinkDeviceActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.DisplayNameActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask"
+            android:theme="@style/Session.DarkTheme.NoActionBar" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.SettingsActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Session.DarkTheme.NoActionBar" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.QRCodeActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.CreatePrivateChatActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.JoinPublicChatActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.SeedActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.PrivacySettingsActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.NotificationSettingsActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.ChatSettingsActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.LinkedDevicesActivity"
+            android:screenOrientation="portrait" />
+        <!-- Session -->
+        <activity android:name="org.thoughtcrime.securesms.loki.LinkedDevicesActivity"
+            android:screenOrientation="portrait" />
        <activity
            android:name="org.thoughtcrime.securesms.WebRtcCallActivity"
            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
@ -169,6 +224,7 @@
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
            android:excludeFromRecents="true"
            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
            android:noHistory="true"
            android:taskAffinity=""
            android:theme="@style/TextSecure.LightNoActionBar"
@ -202,7 +258,7 @@
        <activity-alias
            android:name=".RoutingActivity"
            android:exported="true"
-            android:targetActivity="org.thoughtcrime.securesms.ConversationListActivity">
+            android:targetActivity="org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

@ -250,13 +306,17 @@
            android:name="org.thoughtcrime.securesms.conversation.ConversationActivity"
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
            android:launchMode="singleTask"
-            android:parentActivityName="org.thoughtcrime.securesms.ConversationListActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Session.DarkTheme.NoActionBar"
+            android:parentActivityName="org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity"
            android:windowSoftInputMode="stateUnchanged">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
-                android:value="PsiClass:ConversationListActivity" />
+                android:value="PsiClass:HomeActivity" />
        </activity>
-        <activity android:name="org.thoughtcrime.securesms.longmessage.LongMessageActivity" />
+        <activity
+            android:name="org.thoughtcrime.securesms.longmessage.LongMessageActivity"
+            android:screenOrientation="portrait" />
        <activity
            android:name="org.thoughtcrime.securesms.conversation.ConversationPopupActivity"
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@ -268,7 +328,9 @@
        <activity
            android:name="org.thoughtcrime.securesms.MessageDetailsActivity"
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:label="@string/AndroidManifest__message_details"
+            android:label="Message Details"
+            android:screenOrientation="portrait"
+            android:theme="@style/Session.DarkTheme"
            android:launchMode="singleTask"
            android:windowSoftInputMode="stateHidden" />
        <activity
@ -316,11 +378,13 @@
            android:name="org.thoughtcrime.securesms.giph.ui.GiphyActivity"
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
            android:theme="@style/TextSecure.LightNoActionBar"
+            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateHidden" />
        <activity
            android:name="org.thoughtcrime.securesms.mediasend.MediaSendActivity"
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:theme="@style/TextSecure.DarkNoActionBar"
+            android:screenOrientation="portrait"
+            android:theme="@style/Session.DarkTheme.NoActionBar"
            android:windowSoftInputMode="stateHidden" />
        <activity
            android:name="org.thoughtcrime.securesms.PassphraseChangeActivity"
@ -375,13 +439,16 @@
            android:name="org.thoughtcrime.securesms.MediaPreviewActivity"
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
            android:label="@string/AndroidManifest__media_preview"
+            android:screenOrientation="portrait"
+            android:theme="@style/Session.DarkTheme.SubtitleActionBar"
            android:launchMode="singleTask"
            android:windowSoftInputMode="stateHidden" />
        <activity
            android:name="org.thoughtcrime.securesms.MediaOverviewActivity"
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
            android:launchMode="singleTask"
-            android:theme="@style/TextSecure.LightNoActionBar"
+            android:screenOrientation="portrait"
+            android:theme="@style/Session.DarkTheme.NoActionBar"
            android:windowSoftInputMode="stateHidden" />
        <activity
            android:name="org.thoughtcrime.securesms.DummyActivity"
@ -447,7 +514,8 @@
            android:theme="@style/TextSecure.DarkTheme" />
        <activity
            android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
-            android:theme="@style/TextSecure.DarkTheme" />
+            android:screenOrientation="portrait"
+            android:theme="@style/Session.DarkTheme" />
        <activity
            android:name="org.thoughtcrime.securesms.CreateProfileActivity"
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@ -738,12 +806,19 @@
            <intent-filter>
                <action android:name="info.guardianproject.panic.action.TRIGGER" />
            </intent-filter>
-        </receiver> <!-- Loki -->
+        </receiver>
+        <!-- Session -->
        <receiver android:name="org.thoughtcrime.securesms.loki.BackgroundPollWorker">
            <intent-filter>
                <action android:name="android.intent.action.BOOT_COMPLETED" />
            </intent-filter>
-        </receiver> <!-- Loki -->
+        </receiver>
+        <receiver android:name="org.thoughtcrime.securesms.loki.BackgroundPublicChatPollWorker">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+        <!-- Session -->
        <service
            android:name="org.thoughtcrime.securesms.jobmanager.JobSchedulerScheduler$SystemService"
            android:enabled="@bool/enable_job_service"
--- a/build.gradle
+++ b/build.gradle
@ -27,6 +27,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
 apply plugin: 'witness'
 apply plugin: 'io.fabric'
+apply plugin: 'kotlin-kapt'

 repositories {
    mavenLocal()
@ -112,6 +113,7 @@ dependencies {
    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
    implementation 'com.github.bumptech.glide:glide:4.5.0'
    annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0'
+    kapt 'com.github.bumptech.glide:compiler:4.5.0'
    implementation 'com.makeramen:roundedimageview:2.1.0'
    implementation 'com.pnikosis:materialish-progress:1.5'
    implementation 'org.greenrobot:eventbus:3.0.0'
@ -193,10 +195,13 @@ dependencies {
    implementation("com.crashlytics.sdk.android:crashlytics:$crashlytics_version@aar") {
        transitive = true
    }
+    implementation "com.jakewharton.rxbinding3:rxbinding:3.1.0"
+    implementation "com.github.tbruyelle:rxpermissions:0.10.2"
+    implementation "com.github.ybq:Android-SpinKit:1.4.0"
 }

-def canonicalVersionCode = 23
-def canonicalVersionName = "1.5.2"
+def canonicalVersionCode = 28
+def canonicalVersionName = "1.0.0"

 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
--- a/captures/network.loki.messenger_2019.10.28_13.23.li
+++ b/captures/network.loki.messenger_2019.10.28_13.23.li
--- a/captures/network.loki.messenger_2020.01.06_14.54.li
+++ b/captures/network.loki.messenger_2020.01.06_14.54.li
--- a/captures/network.loki.messenger_2020.01.06_14.56.li
+++ b/captures/network.loki.messenger_2020.01.06_14.56.li
--- a/captures/network.loki.messenger_2020.01.07_11.19.li
+++ b/captures/network.loki.messenger_2020.01.07_11.19.li
--- a/captures/network.loki.messenger_2020.01.07_15.25.li
+++ b/captures/network.loki.messenger_2020.01.07_15.25.li
--- a/captures/network.loki.messenger_2020.01.09_15.47.li
+++ b/captures/network.loki.messenger_2020.01.09_15.47.li
--- a/captures/network.loki.messenger_2020.01.09_15.50.li
+++ b/captures/network.loki.messenger_2020.01.09_15.50.li
--- a/captures/network.loki.messenger_2020.01.13_13.20.li
+++ b/captures/network.loki.messenger_2020.01.13_13.20.li
--- a/captures/network.loki.messenger_2020.01.13_14.04.li
+++ b/captures/network.loki.messenger_2020.01.13_14.04.li
--- a/captures/network.loki.messenger_2020.01.13_15.21.li
+++ b/captures/network.loki.messenger_2020.01.13_15.21.li
--- a/captures/network.loki.messenger_2020.01.13_16.12.li
+++ b/captures/network.loki.messenger_2020.01.13_16.12.li
--- a/captures/network.loki.messenger_2020.01.15_10.02.li
+++ b/captures/network.loki.messenger_2020.01.15_10.02.li
--- a/captures/network.loki.messenger_2020.01.15_10.04.li
+++ b/captures/network.loki.messenger_2020.01.15_10.04.li
--- a/captures/network.loki.messenger_2020.01.15_13.32.li
+++ b/captures/network.loki.messenger_2020.01.15_13.32.li
--- a/captures/network.loki.messenger_2020.01.15_13.41.li
+++ b/captures/network.loki.messenger_2020.01.15_13.41.li
--- a/captures/network.loki.messenger_2020.01.15_14.13.li
+++ b/captures/network.loki.messenger_2020.01.15_14.13.li
--- a/captures/network.loki.messenger_2020.01.15_14.31.li
+++ b/captures/network.loki.messenger_2020.01.15_14.31.li
--- a/captures/network.loki.messenger_2020.01.15_15.19.li
+++ b/captures/network.loki.messenger_2020.01.15_15.19.li
--- a/captures/network.loki.messenger_2020.01.15_16.29.li
+++ b/captures/network.loki.messenger_2020.01.15_16.29.li
--- a/captures/network.loki.messenger_2020.01.16_09.52.li
+++ b/captures/network.loki.messenger_2020.01.16_09.52.li
--- a/captures/network.loki.messenger_2020.01.16_10.01.li
+++ b/captures/network.loki.messenger_2020.01.16_10.01.li
--- a/captures/network.loki.messenger_2020.01.16_11.13.li
+++ b/captures/network.loki.messenger_2020.01.16_11.13.li
--- a/captures/network.loki.messenger_2020.01.16_14.11.li
+++ b/captures/network.loki.messenger_2020.01.16_14.11.li
--- a/captures/network.loki.messenger_2020.01.17_11.17.li
+++ b/captures/network.loki.messenger_2020.01.17_11.17.li
--- a/captures/network.loki.messenger_2020.01.17_11.22.li
+++ b/captures/network.loki.messenger_2020.01.17_11.22.li
--- a/captures/network.loki.messenger_2020.01.23_09.47.li
+++ b/captures/network.loki.messenger_2020.01.23_09.47.li
--- a/captures/network.loki.messenger_2020.01.23_09.50.li
+++ b/captures/network.loki.messenger_2020.01.23_09.50.li
--- a/ic_launcher-web.png
+++ b/ic_launcher-web.png
--- a/play/release/Session.aab
+++ b/play/release/Session.aab
--- a/play/release/Session.apk
+++ b/play/release/Session.apk
--- a/play/release/Signal-play-arm64-v8a-release-1.0.0.apk
+++ b/play/release/Signal-play-arm64-v8a-release-1.0.0.apk
--- a/play/release/Signal-play-armeabi-v7a-release-1.0.0.apk
+++ b/play/release/Signal-play-armeabi-v7a-release-1.0.0.apk
--- a/play/release/Signal-play-x86-release-1.0.0.apk
+++ b/play/release/Signal-play-x86-release-1.0.0.apk
--- a/play/release/Signal-play-x86_64-release-1.0.0.apk
+++ b/play/release/Signal-play-x86_64-release-1.0.0.apk
--- a/play/release/output.json
+++ b/play/release/output.json
@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"arm64-v8a"}],"versionCode":282,"versionName":"1.0.0","enabled":true,"filterName":"arm64-v8a","outputFile":"Signal-play-arm64-v8a-release-1.0.0.apk","fullName":"playArm64-v8aRelease","baseName":"play-arm64-v8a-release"},"path":"Signal-play-arm64-v8a-release-1.0.0.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"armeabi-v7a"}],"versionCode":281,"versionName":"1.0.0","enabled":true,"filterName":"armeabi-v7a","outputFile":"Signal-play-armeabi-v7a-release-1.0.0.apk","fullName":"playArmeabi-v7aRelease","baseName":"play-armeabi-v7a-release"},"path":"Signal-play-armeabi-v7a-release-1.0.0.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[],"versionCode":285,"versionName":"1.0.0","enabled":true,"filterName":"universal","outputFile":"Signal-play-universal-release-1.0.0.apk","fullName":"playUniversalRelease","baseName":"play-universal-release"},"path":"Signal-play-universal-release-1.0.0.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"x86"}],"versionCode":283,"versionName":"1.0.0","enabled":true,"filterName":"x86","outputFile":"Signal-play-x86-release-1.0.0.apk","fullName":"playX86Release","baseName":"play-x86-release"},"path":"Signal-play-x86-release-1.0.0.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"x86_64"}],"versionCode":284,"versionName":"1.0.0","enabled":true,"filterName":"x86_64","outputFile":"Signal-play-x86_64-release-1.0.0.apk","fullName":"playX86_64Release","baseName":"play-x86_64-release"},"path":"Signal-play-x86_64-release-1.0.0.apk","properties":{}}]
--- a/res/anim/fade_scale_out.xml
+++ b/res/anim/fade_scale_out.xml
@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>

-<set xmlns:android="http://schemas.android.com/apk/res/android"
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
    android:interpolator="@android:anim/decelerate_interpolator">
+
    <scale
-        android:duration="150"
+        android:duration="250"
        android:fromXScale="1.0"
        android:fromYScale="1.0"
        android:toXScale="0.85"
        android:toYScale="0.85"
        android:pivotX="50%"
        android:pivotY="50%" />
+
    <alpha
-        android:duration="150"
+        android:duration="250"
        android:fromAlpha="1.0"
        android:toAlpha="0.6" />
+
 </set>
--- a/res/anim/slide_from_bottom.xml
+++ b/res/anim/slide_from_bottom.xml
@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">
+
    <translate
-            android:duration="350"
-            android:fromYDelta="100%"
-            android:toYDelta="0%" />
+        android:duration="250"
+        android:fromYDelta="100%"
+        android:toYDelta="0%" />
+
 </set>
--- a/res/anim/slide_from_left.xml
+++ b/res/anim/slide_from_left.xml
@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>

-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/decelerate_interpolator">
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">
+
    <translate
        android:duration="250"
        android:fromXDelta="-100%"
        android:toXDelta="0%" />
+
 </set>
--- a/res/anim/slide_from_right.xml
+++ b/res/anim/slide_from_right.xml
@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">

-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/decelerate_interpolator">
    <translate
        android:duration="250"
        android:fromXDelta="100%"
        android:toXDelta="0%" />
+
 </set>
--- a/res/drawable-anydpi-v24/ic_notification.xml
+++ b/res/drawable-anydpi-v24/ic_notification.xml
@ -1,15 +1,19 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:viewportWidth="1109.6405"
-    android:viewportHeight="1109.7455"
+    android:viewportWidth="487.39856"
+    android:viewportHeight="487.39856"
    android:tint="#FFFFFF">
-  <group android:translateX="-466.04904"
-      android:translateY="-466.09314">
-    <group android:translateX="492.4193"
-        android:translateY="520.9659">
-        <path android:fillColor="#FFFFFF" android:pathData="M480,730.8l-358.6,-358.5l371.8,-371.8l99,99.1l-272.6,272.7l259.4,259.5z"/>
-        <path android:fillColor="#FFFFFF" android:pathData="M563.7,999.5l-99.1,-99.1l272.7,-272.7l-259.5,-259.5l99.1,-99l358.5,358.5z"/>
+  <group android:translateX="41.656616"
+      android:translateY="19.495943">
+    <group>
+      <clip-path android:pathData="M0,0L404.085,0L404.085,448.407L0,448.407Z M 0,0"/>
+      <path
+          android:pathData="m288.607,420.376l-196.335,-0c-33.576,-0 -62.508,-25.748 -64.164,-59.281 -1.771,-35.847 26.883,-65.576 62.353,-65.576l113.072,-0c6.919,-0 12.527,-5.608 12.527,-12.525l0,-92.305L327.307,252.333C356.723,268.633 375.241,299.335 376.027,332.848 377.161,380.975 336.746,420.376 288.607,420.376m-211.829,-224.303c-29.416,-16.3 -47.933,-47.001 -48.721,-80.515 -1.132,-48.127 39.283,-87.528 87.42,-87.528L311.811,28.031c33.576,-0 62.508,25.748 64.165,59.283 1.771,35.845 -26.883,65.575 -62.352,65.575 0,-0 -81.316,0.013 -113.077,0.019 -6.915,0.001 -12.499,5.608 -12.501,12.523l-0.021,92.289zM340.891,227.816 L256.254,180.919l57.371,-0c49.877,-0 90.46,-40.579 90.46,-90.457 0,-49.877 -40.583,-90.461 -90.46,-90.461l-200.299,-0c-62.485,-0 -113.327,50.841 -113.327,113.327 0,44.567 24.216,85.664 63.195,107.265l84.636,46.896l-57.368,-0c-49.88,-0 -90.463,40.58 -90.463,90.457 0,49.877 40.583,90.461 90.463,90.461L290.758,448.407c62.488,-0 113.327,-50.84 113.327,-113.327 0,-44.567 -24.216,-85.664 -63.193,-107.264"
+          android:fillColor="#00f782"
+          android:strokeColor="#00000000"
+          android:fillType="nonZero"
+          android:fillAlpha="1"/>
    </group>
  </group>
 </vector>
--- a/res/drawable-hdpi/ic_arrow_up.png
+++ b/res/drawable-hdpi/ic_arrow_up.png
--- a/res/drawable-hdpi/ic_notification.png
+++ b/res/drawable-hdpi/ic_notification.png
--- a/res/drawable-mdpi/ic_arrow_up.png
+++ b/res/drawable-mdpi/ic_arrow_up.png
--- a/res/drawable-mdpi/ic_notification.png
+++ b/res/drawable-mdpi/ic_notification.png
--- a/res/drawable-xhdpi/ic_arrow_up.png
+++ b/res/drawable-xhdpi/ic_arrow_up.png
--- a/res/drawable-xhdpi/ic_notification.png
+++ b/res/drawable-xhdpi/ic_notification.png
--- a/res/drawable-xxhdpi/ic_arrow_up.png
+++ b/res/drawable-xxhdpi/ic_arrow_up.png
--- a/res/drawable-xxhdpi/ic_notification.png
+++ b/res/drawable-xxhdpi/ic_notification.png
--- a/res/drawable-xxxhdpi/ic_arrow_up.png
+++ b/res/drawable-xxxhdpi/ic_arrow_up.png
--- a/res/drawable/compose_background_dark.xml
+++ b/res/drawable/compose_background_dark.xml
@ -4,11 +4,11 @@
    android:shape="rectangle">

    <stroke
-        android:width="1dp"
-        android:color="@color/core_grey_75" />
+        android:width="1px"
+        android:color="@color/separator" />

    <solid
-        android:color="@color/core_grey_90" />
+        android:color="@color/compose_text_view_background" />

    <corners
        android:radius="20dp" />
--- a/res/drawable/conversation_view_background.xml
+++ b/res/drawable/conversation_view_background.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/cell_selected">
+
+    <item>
+        <color android:color="@color/cell_background" />
+    </item>
+</ripple>
--- a/res/drawable/default_dialog_background.xml
+++ b/res/drawable/default_dialog_background.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/dialog_background" />
+
+    <corners android:radius="@dimen/dialog_corner_radius" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/dialog_border" />
+</shape>
--- a/res/drawable/default_dialog_background_inset.xml
+++ b/res/drawable/default_dialog_background_inset.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/default_dialog_background"
+    android:insetRight="@dimen/medium_spacing"
+    android:insetLeft="@dimen/medium_spacing">
+</inset>
--- a/res/drawable/default_session_background.xml
+++ b/res/drawable/default_session_background.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <gradient
+        android:angle="90"
+        android:startColor="#121212"
+        android:endColor="#171717"
+        android:type="linear" />
+
+</shape>
--- a/res/drawable/default_session_progress.xml
+++ b/res/drawable/default_session_progress.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/accent" />
+</shape>
--- a/res/drawable/destructive_dialog_button_background.xml
+++ b/res/drawable/destructive_dialog_button_background.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/destructive" />
+
+    <corners android:radius="@dimen/dialog_button_corner_radius" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/destructive" />
+</shape>
--- a/res/drawable/fake_chat_view_incoming_message_background.xml
+++ b/res/drawable/fake_chat_view_incoming_message_background.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/accent" />
+
+    <corners android:radius="@dimen/fake_chat_view_bubble_corner_radius" />
+</shape>
--- a/res/drawable/fake_chat_view_outgoing_message_background.xml
+++ b/res/drawable/fake_chat_view_outgoing_message_background.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/fake_chat_bubble_background" />
+
+    <corners android:radius="@dimen/fake_chat_view_bubble_corner_radius" />
+</shape>
--- a/res/drawable/ic_circle_check.xml
+++ b/res/drawable/ic_circle_check.xml
@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="15"
+    android:viewportWidth="15" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M7.5,7.5m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"
+        android:strokeColor="#FFFFFF" android:strokeWidth="1"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M4.77,7.61c-0.15,-0.15 -0.38,-0.15 -0.53,0c-0.15,0.15 -0.15,0.38 0,0.53l1.88,1.88c0.15,0.15 0.38,0.15 0.53,0l4.13,-4.12c0.15,-0.15 0.15,-0.38 0,-0.53c-0.15,-0.15 -0.38,-0.15 -0.53,0L6.38,9.22L4.77,7.61z"/>
+</vector>
--- a/res/drawable/ic_circle_dot_dot_dot.xml
+++ b/res/drawable/ic_circle_dot_dot_dot.xml
@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="15"
+    android:viewportWidth="15" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M7.5,7.5m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"
+        android:strokeColor="#FFFFFF" android:strokeWidth="1"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M4.76,7.47c0,-0.32 0.26,-0.57 0.57,-0.57c0.32,0 0.57,0.25 0.57,0.57c0,0.31 -0.25,0.57 -0.57,0.57C5.02,8.04 4.76,7.78 4.76,7.47zM7.04,7.47c0,-0.32 0.26,-0.57 0.57,-0.57c0.32,0 0.57,0.25 0.57,0.57c0,0.31 -0.25,0.57 -0.57,0.57C7.3,8.04 7.04,7.78 7.04,7.47zM9.32,7.47c0,-0.32 0.26,-0.57 0.57,-0.57c0.32,0 0.57,0.25 0.57,0.57c0,0.31 -0.25,0.57 -0.57,0.57C9.58,8.04 9.32,7.78 9.32,7.47z"/>
+</vector>
--- a/res/drawable/ic_circle_plus.xml
+++ b/res/drawable/ic_circle_plus.xml
@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="27dp"
+    android:height="27dp"
+    android:viewportWidth="27"
+    android:viewportHeight="27">
+  <group>
+    <clip-path android:pathData="M-19,-756h375v812h-375z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-3,-3h33v33h-33z M 0,0"/>
+      <group>
+        <clip-path android:pathData="M13.51,8.82c-0.35,0 -0.63,0.28 -0.62,0.62v3.43H9.46c-0.35,0 -0.63,0.28 -0.62,0.62c0,0.35 0.28,0.63 0.62,0.62h3.43v3.43c-0.02,0.35 0.27,0.63 0.61,0.63c0.17,0 0.33,-0.07 0.44,-0.18c0.11,-0.11 0.18,-0.27 0.18,-0.44v-3.43h3.43c0.17,0 0.33,-0.07 0.44,-0.18c0.11,-0.11 0.18,-0.27 0.18,-0.44c0,-0.35 -0.28,-0.63 -0.62,-0.62h-3.43V9.44C14.13,9.09 13.85,8.81 13.51,8.82zM21.46,5.54c4.39,4.39 4.39,11.53 0,15.92c-4.39,4.39 -11.53,4.39 -15.92,0s-4.39,-11.53 0,-15.92C9.93,1.15 17.07,1.15 21.46,5.54zM22.34,22.34c4.88,-4.88 4.88,-12.81 0,-17.69s-12.81,-4.88 -17.69,0s-4.88,12.81 0,17.69S17.47,27.22 22.34,22.34z M 0,0"/>
+        <group>
+          <clip-path android:pathData="M0,0h27v27h-27z M 0,0"/>
+          <path
+              android:pathData="M-4,-4h35v35h-35z"
+              android:strokeAlpha="0.9"
+              android:fillColor="#FFFFFF"
+              android:fillAlpha="0.9"/>
+        </group>
+      </group>
+    </group>
+    <group>
+      <clip-path android:pathData="M-3,-3h33v33h-33z M 0,0"/>
+      <group>
+        <clip-path android:pathData="M0,0h27v27h-27z M 0,0"/>
+        <path
+            android:pathData="M13.51,8.82c-0.35,0 -0.63,0.28 -0.62,0.62v3.43H9.46c-0.35,0 -0.63,0.28 -0.62,0.62c0,0.35 0.28,0.63 0.62,0.62h3.43v3.43c-0.02,0.35 0.27,0.63 0.61,0.63c0.17,0 0.33,-0.07 0.44,-0.18c0.11,-0.11 0.18,-0.27 0.18,-0.44v-3.43h3.43c0.17,0 0.33,-0.07 0.44,-0.18c0.11,-0.11 0.18,-0.27 0.18,-0.44c0,-0.35 -0.28,-0.63 -0.62,-0.62h-3.43V9.44C14.13,9.09 13.85,8.81 13.51,8.82zM21.46,5.54c4.39,4.39 4.39,11.53 0,15.92c-4.39,4.39 -11.53,4.39 -15.92,0c-4.39,-4.39 -4.39,-11.53 0,-15.92C9.93,1.15 17.07,1.15 21.46,5.54zM22.34,22.34c4.88,-4.88 4.88,-12.81 0,-17.69s-12.81,-4.88 -17.69,0s-4.88,12.81 0,17.69S17.47,27.22 22.34,22.34z"
+            android:strokeAlpha="0.9"
+            android:strokeWidth="0.5"
+            android:fillColor="#00000000"
+            android:strokeColor="#FFFFFF"
+            android:fillAlpha="0.9"/>
+      </group>
+    </group>
+  </group>
+</vector>
--- a/res/drawable/ic_filled_circle_check.xml
+++ b/res/drawable/ic_filled_circle_check.xml
@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="13"
+    android:viewportWidth="13" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M6.5,6.5m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"/>
+    <path android:fillColor="#231F20" android:pathData="M3.77,6.61c-0.15,-0.15 -0.38,-0.15 -0.53,0c-0.15,0.15 -0.15,0.38 0,0.53l1.88,1.88c0.15,0.15 0.38,0.15 0.53,0L9.78,4.9c0.15,-0.15 0.15,-0.38 0,-0.53c-0.15,-0.15 -0.38,-0.15 -0.53,0L5.38,8.22L3.77,6.61z"/>
+</vector>
--- a/res/drawable/ic_gear.xml
+++ b/res/drawable/ic_gear.xml
@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M12.5,7.48c-2.77,0 -5.02,2.25 -5.02,5.02c0,2.77 2.25,5.02 5.02,5.02s5.02,-2.25 5.02,-5.02C17.52,9.73 15.27,7.48 12.5,7.48zM12.5,15.82c-1.83,0 -3.32,-1.49 -3.32,-3.32c0,-1.83 1.49,-3.32 3.32,-3.32s3.32,1.49 3.32,3.32C15.82,14.33 14.33,15.82 12.5,15.82z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M23.57,9.88l-2.25,-0.24c-0.15,-0.47 -0.34,-0.92 -0.56,-1.36l1.42,-1.76c0.41,-0.51 0.37,-1.24 -0.09,-1.7l-1.91,-1.91c-0.46,-0.46 -1.2,-0.5 -1.7,-0.09l-1.76,1.42c-0.44,-0.22 -0.89,-0.41 -1.36,-0.56l-0.24,-2.25c-0.07,-0.65 -0.62,-1.14 -1.27,-1.14h-2.7c-0.65,0 -1.2,0.49 -1.27,1.14L9.64,3.67C9.17,3.83 8.72,4.01 8.28,4.24L6.52,2.82c-0.51,-0.41 -1.24,-0.37 -1.7,0.09L2.91,4.82c-0.46,0.46 -0.5,1.19 -0.09,1.7l1.42,1.76C4.01,8.72 3.83,9.17 3.67,9.64L1.42,9.88c-0.65,0.07 -1.14,0.62 -1.14,1.27v2.7c0,0.65 0.49,1.2 1.14,1.27l2.25,0.24c0.15,0.46 0.34,0.92 0.56,1.36l-1.42,1.76c-0.41,0.51 -0.37,1.24 0.09,1.7l1.91,1.91c0.46,0.46 1.19,0.5 1.7,0.09l1.76,-1.42c0.44,0.22 0.89,0.41 1.36,0.56l0.24,2.25c0.07,0.65 0.61,1.14 1.27,1.14h2.7c0.65,0 1.2,-0.49 1.27,-1.14l0.24,-2.25c0.46,-0.15 0.92,-0.34 1.36,-0.56l1.76,1.42c0.51,0.41 1.24,0.37 1.7,-0.09l1.91,-1.91c0.46,-0.46 0.5,-1.19 0.09,-1.7l-1.42,-1.76c0.22,-0.44 0.41,-0.89 0.56,-1.36l2.25,-0.24c0.65,-0.07 1.14,-0.62 1.14,-1.27v-2.7C24.71,10.5 24.22,9.95 23.57,9.88zM23.01,13.47l-2.15,0.23c-0.51,0.06 -0.94,0.41 -1.08,0.91c-0.16,0.53 -0.37,1.05 -0.64,1.53c-0.25,0.46 -0.21,1.01 0.12,1.41l1.36,1.69l-1.37,1.37l-1.69,-1.36c-0.4,-0.32 -0.96,-0.37 -1.41,-0.12c-0.49,0.27 -1,0.48 -1.53,0.64c-0.5,0.14 -0.86,0.57 -0.91,1.08l-0.23,2.15h-1.94l-0.23,-2.15c-0.06,-0.51 -0.41,-0.94 -0.91,-1.08c-0.53,-0.15 -1.05,-0.37 -1.53,-0.64c-0.46,-0.25 -1.01,-0.21 -1.41,0.12l-1.69,1.36l-1.37,-1.37l1.36,-1.69c0.33,-0.4 0.37,-0.96 0.12,-1.42c-0.27,-0.49 -0.48,-1 -0.64,-1.53c-0.14,-0.5 -0.57,-0.86 -1.08,-0.91l-2.15,-0.23v-1.94l2.15,-0.23c0.51,-0.05 0.94,-0.41 1.08,-0.91c0.15,-0.53 0.37,-1.05 0.64,-1.54c0.25,-0.46 0.2,-1.01 -0.12,-1.41L4.38,5.75l1.37,-1.37l1.69,1.36c0.4,0.32 0.96,0.37 1.41,0.12c0.49,-0.27 1,-0.48 1.53,-0.64c0.5,-0.15 0.86,-0.57 0.91,-1.08l0.23,-2.15h1.94l0.23,2.15c0.06,0.51 0.41,0.94 0.91,1.08c0.53,0.15 1.05,0.37 1.53,0.64c0.45,0.25 1.01,0.21 1.41,-0.12l1.69,-1.36l1.37,1.37l-1.36,1.69c-0.32,0.4 -0.37,0.96 -0.12,1.41c0.27,0.48 0.48,1 0.64,1.53c0.14,0.5 0.57,0.86 1.08,0.92l2.15,0.23V13.47z"
+      android:fillColor="#FFFFFF"/>
+</vector>
--- a/res/drawable/ic_globe.xml
+++ b/res/drawable/ic_globe.xml
@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="25"
+    android:viewportWidth="25" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M12.5,0.61C5.94,0.61 0.61,5.94 0.61,12.5S5.94,24.39 12.5,24.39s11.89,-5.34 11.89,-11.89S19.06,0.61 12.5,0.61zM2.35,13.35h3.41c0.05,1.35 0.22,2.64 0.5,3.82H3.45C2.85,16.01 2.46,14.72 2.35,13.35zM13.35,6.13V2.47c1.22,0.44 2.3,1.78 3.07,3.66H13.35zM16.98,7.83c0.31,1.17 0.51,2.46 0.57,3.82h-4.19V7.83H16.98zM11.65,2.47v3.66H8.58C9.35,4.24 10.43,2.9 11.65,2.47zM11.65,7.83v3.82H7.46C7.52,10.29 7.72,9 8.02,7.83H11.65zM5.76,11.65H2.35c0.11,-1.37 0.5,-2.66 1.1,-3.82h2.81C5.98,9.01 5.81,10.3 5.76,11.65zM7.46,13.35h4.19v3.82H8.02C7.72,16 7.52,14.71 7.46,13.35zM11.65,18.87v3.66c-1.22,-0.44 -2.3,-1.78 -3.07,-3.66H11.65zM13.35,22.53v-3.66h3.07C15.65,20.76 14.57,22.1 13.35,22.53zM13.35,17.17v-3.82h4.19c-0.06,1.36 -0.26,2.65 -0.57,3.82H13.35zM19.24,13.35h3.41c-0.11,1.37 -0.5,2.66 -1.1,3.82h-2.81C19.02,15.99 19.19,14.7 19.24,13.35zM19.24,11.65c-0.05,-1.35 -0.22,-2.64 -0.5,-3.82h2.81c0.6,1.16 0.99,2.45 1.1,3.82H19.24zM20.45,6.13h-2.21c-0.38,-1.08 -0.86,-2.05 -1.42,-2.85C18.23,3.94 19.47,4.92 20.45,6.13zM8.18,3.28c-0.56,0.8 -1.03,1.77 -1.42,2.85H4.56C5.53,4.92 6.77,3.94 8.18,3.28zM4.55,18.87h2.21c0.38,1.08 0.86,2.05 1.42,2.85C6.77,21.06 5.53,20.08 4.55,18.87zM16.82,21.72c0.56,-0.8 1.03,-1.77 1.42,-2.85h2.21C19.47,20.08 18.23,21.06 16.82,21.72z"/>
+</vector>
--- a/res/drawable/ic_key.xml
+++ b/res/drawable/ic_key.xml
@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="506"
+    android:viewportHeight="512">
+  <group>
+    <clip-path android:pathData="M331.974,0C236.555,0 158.925,77.63 158.925,173.049C158.925,194.262 162.694,214.876 170.136,234.452L4.672,399.928C2.307,402.294 0.978,405.501 0.978,408.845L0.978,499.389C0.978,506.354 6.624,512 13.589,512L88.205,512C91.546,512 94.75,510.675 97.115,508.314L122.26,483.207C124.63,480.841 125.961,477.63 125.961,474.282L125.961,443.406L156.798,443.406C163.763,443.406 169.409,437.76 169.409,430.795L169.409,418.435L181.77,418.435C188.734,418.435 194.381,412.789 194.381,405.824L194.381,378.688L221.517,378.688C224.861,378.688 228.068,377.359 230.434,374.994L270.555,334.873C290.134,342.322 310.751,346.096 331.972,346.096C427.391,346.096 505.021,268.466 505.021,173.047C505.021,77.63 427.393,0 331.974,0ZM331.974,320.874C311.332,320.874 291.368,316.705 272.635,308.481C267.791,306.355 262.336,307.525 258.764,311.006C258.725,311.043 258.687,311.073 258.649,311.112L216.295,353.466L181.772,353.466C174.807,353.466 169.161,359.112 169.161,366.077L169.161,393.213L156.8,393.213C149.836,393.213 144.189,398.859 144.189,405.824L144.189,418.184L113.351,418.184C106.387,418.184 100.74,423.83 100.74,430.795L100.74,469.052L82.987,486.777L26.202,486.777L26.202,468.956L180.343,314.816C184.776,310.383 184.776,303.197 180.343,298.765C175.91,294.333 168.726,294.331 164.29,298.765L26.202,436.854L26.202,414.07L193.898,246.362C193.936,246.324 193.965,246.289 194,246.252C197.482,242.683 198.656,237.228 196.53,232.38C188.314,213.648 184.15,193.685 184.15,173.05C184.15,91.538 250.465,25.223 331.977,25.223C413.489,25.223 479.802,91.537 479.802,173.05C479.802,254.56 413.484,320.874 331.974,320.874Z M 0,0"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M-4.022,-5L510.021,-5L510.021,517L-4.022,517Z"/>
+  </group>
+  <group>
+    <clip-path android:pathData="M384.638,73.144C358.591,73.144 337.401,94.334 337.401,120.381C337.401,146.428 358.591,167.618 384.638,167.618C410.685,167.618 431.875,146.428 431.875,120.381C431.875,94.334 410.686,73.144 384.638,73.144ZM384.638,142.396C372.499,142.396 362.623,132.52 362.623,120.381C362.623,108.242 372.499,98.366 384.638,98.366C396.777,98.366 406.653,108.242 406.653,120.381C406.653,132.52 396.777,142.396 384.638,142.396Z M 0,0"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M332.401,68.144L436.875,68.144L436.875,172.618L332.401,172.618Z"/>
+  </group>
+</vector>
--- a/res/drawable/ic_launcher_foreground.xml
+++ b/res/drawable/ic_launcher_foreground.xml
@ -1,11 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="108dp"
    android:height="108dp"
-    android:viewportWidth="2041.7386"
-    android:viewportHeight="2041.9318">
-  <group android:translateX="492.4193"
-      android:translateY="520.9659">
-      <path android:fillColor="#FFFFFF" android:pathData="M480,730.8l-358.6,-358.5l371.8,-371.8l99,99.1l-272.6,272.7l259.4,259.5z"/>
-      <path android:fillColor="#FFFFFF" android:pathData="M563.7,999.5l-99.1,-99.1l272.7,-272.7l-259.5,-259.5l99.1,-99l358.5,358.5z"/>
+    android:viewportWidth="1018.39685"
+    android:viewportHeight="1019.1061">
+  <group android:translateX="307.15576"
+      android:translateY="285.3497">
+      <group>
+          <clip-path android:pathData="M0,0L404.085,0L404.085,448.407L0,448.407Z M 0,0"/>
+          <path android:fillAlpha="1" android:fillColor="#00f782"
+              android:fillType="nonZero"
+              android:pathData="m288.607,420.376l-196.335,-0c-33.576,-0 -62.508,-25.748 -64.164,-59.281 -1.771,-35.847 26.883,-65.576 62.353,-65.576l113.072,-0c6.919,-0 12.527,-5.608 12.527,-12.525l0,-92.305L327.307,252.333C356.723,268.633 375.241,299.335 376.027,332.848 377.161,380.975 336.746,420.376 288.607,420.376m-211.829,-224.303c-29.416,-16.3 -47.933,-47.001 -48.721,-80.515 -1.132,-48.127 39.283,-87.528 87.42,-87.528L311.811,28.031c33.576,-0 62.508,25.748 64.165,59.283 1.771,35.845 -26.883,65.575 -62.352,65.575 0,-0 -81.316,0.013 -113.077,0.019 -6.915,0.001 -12.499,5.608 -12.501,12.523l-0.021,92.289zM340.891,227.816 L256.254,180.919l57.371,-0c49.877,-0 90.46,-40.579 90.46,-90.457 0,-49.877 -40.583,-90.461 -90.46,-90.461l-200.299,-0c-62.485,-0 -113.327,50.841 -113.327,113.327 0,44.567 24.216,85.664 63.195,107.265l84.636,46.896l-57.368,-0c-49.88,-0 -90.463,40.58 -90.463,90.457 0,49.877 40.583,90.461 90.463,90.461L290.758,448.407c62.488,-0 113.327,-50.84 113.327,-113.327 0,-44.567 -24.216,-85.664 -63.193,-107.264" android:strokeColor="#00000000"/>
+      </group>
  </group>
 </vector>
--- a/res/drawable/ic_microphone.xml
+++ b/res/drawable/ic_microphone.xml
@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="27dp"
+    android:viewportWidth="18"
+    android:viewportHeight="27">
+  <group>
+    <clip-path android:pathData="M-54,-756h375v812h-375z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-2,-2h23v31h-23z M 0,0"/>
+      <group>
+        <clip-path android:pathData="M9.36,2.25c2.02,0 3.67,1.64 3.67,3.65v6.65c0,2.01 -1.65,3.65 -3.67,3.65s-3.67,-1.64 -3.67,-3.65V5.9C5.69,3.89 7.34,2.25 9.36,2.25zM17.09,11.92c0.35,0 0.63,0.28 0.63,0.63c0,4.37 -3.41,7.97 -7.73,8.29v3.91h3.27c0.35,0 0.63,0.28 0.63,0.63S13.61,26 13.26,26H5.46c-0.35,0 -0.63,-0.28 -0.63,-0.63s0.28,-0.63 0.63,-0.63h3.27v-3.91C4.41,20.53 1,16.92 1,12.55c0,-0.35 0.28,-0.63 0.63,-0.63c0.35,0 0.62,0.28 0.61,0.63c0,3.9 3.19,7.07 7.11,7.07s7.11,-3.17 7.11,-7.07C16.46,12.2 16.74,11.92 17.09,11.92zM9.36,17.44c2.71,0 4.92,-2.2 4.92,-4.9V5.9c0,-2.7 -2.21,-4.9 -4.92,-4.9S4.44,3.2 4.44,5.9v6.65C4.44,15.25 6.65,17.44 9.36,17.44z M 0,0"/>
+        <group>
+          <clip-path android:pathData="M0,0h18v27h-18z M 0,0"/>
+          <path
+              android:pathData="M-4,-4h26.72v35h-26.72z"
+              android:strokeAlpha="0.9"
+              android:fillColor="#FFFFFF"
+              android:fillAlpha="0.9"/>
+        </group>
+      </group>
+    </group>
+    <group>
+      <clip-path android:pathData="M-2,-2h23v31h-23z M 0,0"/>
+      <group>
+        <clip-path android:pathData="M0,0h18v27h-18z M 0,0"/>
+        <path
+            android:pathData="M9.36,2.25c2.02,0 3.67,1.64 3.67,3.65v6.65c0,2.01 -1.65,3.65 -3.67,3.65s-3.67,-1.64 -3.67,-3.65V5.9C5.69,3.89 7.34,2.25 9.36,2.25zM17.09,11.92c0.35,0 0.63,0.28 0.63,0.63c0,4.37 -3.41,7.97 -7.73,8.29v3.91h3.27c0.35,0 0.63,0.28 0.63,0.63S13.61,26 13.26,26H5.46c-0.35,0 -0.63,-0.28 -0.63,-0.63s0.28,-0.63 0.63,-0.63h3.27v-3.91C4.41,20.53 1,16.92 1,12.55c0,-0.35 0.28,-0.63 0.63,-0.63s0.62,0.28 0.61,0.63c0,3.9 3.19,7.07 7.11,7.07s7.11,-3.17 7.11,-7.07C16.46,12.2 16.74,11.92 17.09,11.92zM9.36,17.44c2.71,0 4.92,-2.2 4.92,-4.9V5.9c0,-2.7 -2.21,-4.9 -4.92,-4.9S4.44,3.2 4.44,5.9v6.65C4.44,15.25 6.65,17.44 9.36,17.44z"
+            android:strokeAlpha="0.9"
+            android:strokeWidth="0.5"
+            android:fillColor="#00000000"
+            android:strokeColor="#FFFFFF"
+            android:fillAlpha="0.9"/>
+      </group>
+    </group>
+  </group>
+</vector>
--- a/res/drawable/ic_mute.xml
+++ b/res/drawable/ic_mute.xml
@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M215.03,71.05L126.06,160H24c-13.26,0 -24,10.74 -24,24v144c0,13.25 10.74,24 24,24h102.06l88.97,88.95c15.03,15.03 40.97,4.47 40.97,-16.97V88.02c0,-21.46 -25.96,-31.98 -40.97,-16.97zM461.64,256l45.64,-45.64c6.3,-6.3 6.3,-16.52 0,-22.82l-22.82,-22.82c-6.3,-6.3 -16.52,-6.3 -22.82,0L416,210.36l-45.64,-45.64c-6.3,-6.3 -16.52,-6.3 -22.82,0l-22.82,22.82c-6.3,6.3 -6.3,16.52 0,22.82L370.36,256l-45.63,45.63c-6.3,6.3 -6.3,16.52 0,22.82l22.82,22.82c6.3,6.3 16.52,6.3 22.82,0L416,301.64l45.64,45.64c6.3,6.3 16.52,6.3 22.82,0l22.82,-22.82c6.3,-6.3 6.3,-16.52 0,-22.82L461.64,256z"
+      android:fillColor="#FFFFFF"/>
+</vector>
--- a/res/drawable/ic_plus_24.xml
+++ b/res/drawable/ic_plus_24.xml
@ -4,6 +4,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFF"
      android:pathData="M22,11.2l-9.2,0l0,-9.2l-1.6,0l0,9.2l-9.2,0l0,1.6l9.2,0l0,9.2l1.6,0l0,-9.2l9.2,0z"/>
 </vector>
--- a/res/drawable/ic_qr_code.xml
+++ b/res/drawable/ic_qr_code.xml
@ -0,0 +1,240 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <group>
+    <clip-path android:pathData="M7.81,7.81H1.56V1.56h6.25V7.81zM9.38,0H0v9.38h9.38V0z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M-5,-5h19.38v19.38h-19.38z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M3.12,3.12h3.12v3.12h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M-1.88,-1.88h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M1.56,17.19h6.25v6.25H1.56V17.19zM0,25h9.38v-9.38H0V25z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M-5,10.62h19.38v19.38h-19.38z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M3.12,18.75h3.12v3.12h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M-1.88,13.75h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M23.44,7.81h-6.25V1.56h6.25V7.81zM15.62,0v9.38H25V0H15.62z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M10.62,-5h19.38v19.38h-19.38z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M18.75,3.12h3.12v3.12h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M13.75,-1.88h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M3.12,10.94l-3.12,0l0,3.12l4.69,0l0,-1.56l-1.57,0z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M-5,5.94h14.69v13.12h-14.69z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M10.94,14.06h3.12v3.12h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M5.94,9.06h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M4.69,10.94h3.12v1.56h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M-0.31,5.94h13.12v11.56h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M14.06,18.75l-3.12,0l0,1.56l1.56,0l0,1.57l1.56,0l0,-1.57z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M5.94,13.75h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M9.38,10.94l0,1.56l-1.57,0l0,1.56l3.13,0l0,-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M2.81,5.94h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M12.5,6.25h1.56v3.12h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M7.5,1.25h11.56v13.12h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M14.06,12.5l0,1.56l3.13,0l0,-3.12l-4.69,0l0,1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M7.5,5.94h14.69v13.12h-14.69z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M10.94,9.38h1.56v1.56h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M5.94,4.38h11.56v11.56h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M14.06,21.88h3.12v3.12h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M9.06,16.88h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M10.94,21.88h1.56v3.12h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M5.94,16.88h11.56v13.12h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M14.06,17.19h1.56v1.56h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M9.06,12.19h11.56v11.56h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M14.06,4.69l0,-3.13l-1.56,0l0,-1.56l-1.56,0l0,6.25l1.56,0l0,-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M5.94,-5h13.12v16.25h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M18.75,21.88h1.56v3.12h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M13.75,16.88h11.56v13.12h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M18.75,18.75h3.12v1.56h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M13.75,13.75h13.12v11.56h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M17.19,20.31h1.56v1.56h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M12.19,15.31h11.56v11.56h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M15.62,18.75h1.56v1.56h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M10.62,13.75h11.56v11.56h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M21.88,15.62l0,1.57l1.56,0l0,1.56l1.56,0l0,-3.13l-1.56,0z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M16.88,10.62h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M23.44,20.31l-1.56,0l0,4.69l3.12,0l0,-3.12l-1.56,0z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M16.88,15.31h13.12v14.69h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M15.62,15.62l0,1.57l4.69,0l0,-3.13l-3.12,0l0,1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M10.62,9.06h14.69v13.12h-14.69z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M18.75,10.94l0,1.56l3.13,0l0,1.56l3.12,0l0,-3.12l-3.12,0z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M13.75,5.94h16.25v13.12h-16.25z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+</vector>
--- a/res/drawable/media_count_button_background.xml
+++ b/res/drawable/media_count_button_background.xml
@ -1,5 +1,5 @@
 <?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/signal_primary" />
+    <solid android:color="@color/accent" />
 </shape>
--- a/res/drawable/mediarail_media_outline.xml
+++ b/res/drawable/mediarail_media_outline.xml
@ -4,5 +4,5 @@

    <stroke
        android:width="3dp"
-        android:color="@color/signal_primary"/>
+        android:color="@color/accent"/>
 </shape>
--- a/res/drawable/mention_candidate_view_background.xml
+++ b/res/drawable/mention_candidate_view_background.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/cell_selected">
+
+    <item>
+        <color android:color="@color/compose_view_background" />
+    </item>
+</ripple>
--- a/res/drawable/new_conversation_button_background.xml
+++ b/res/drawable/new_conversation_button_background.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient android:type="radial" android:gradientRadius="36dp" android:startColor="@color/accent" android:endColor="@android:color/transparent" />
+</shape>
--- a/res/drawable/new_conversation_button_foreground.xml
+++ b/res/drawable/new_conversation_button_foreground.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="@color/accent" />
+</shape>
--- a/res/drawable/permission_rationale_dialog_corners.xml
+++ b/res/drawable/permission_rationale_dialog_corners.xml
@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="?attr/dialog_background_color"/>
-    <corners android:radius="20dp"/>
+
+    <solid android:color="@color/compose_view_background"/>
+
+    <corners android:radius="12dp"/>
 </shape>
--- a/res/drawable/pill.xml
+++ b/res/drawable/pill.xml
@ -1,5 +1,5 @@
 <?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/signal_primary" />
+    <solid android:color="@color/accent" />
 </shape>
--- a/res/drawable/profile_picture_view_large_background.xml
+++ b/res/drawable/profile_picture_view_large_background.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/unimportant" />
+
+    <corners android:radius="38dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+</shape>
--- a/res/drawable/profile_picture_view_large_foreground.xml
+++ b/res/drawable/profile_picture_view_large_foreground.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/transparent" />
+
+    <corners android:radius="38dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+</shape>
--- a/res/drawable/profile_picture_view_medium_background.xml
+++ b/res/drawable/profile_picture_view_medium_background.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/unimportant" />
+
+    <corners android:radius="23dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+</shape>
--- a/res/drawable/profile_picture_view_medium_foreground.xml
+++ b/res/drawable/profile_picture_view_medium_foreground.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/transparent" />
+
+    <corners android:radius="23dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+</shape>
--- a/res/drawable/profile_picture_view_rss_medium_background.xml
+++ b/res/drawable/profile_picture_view_rss_medium_background.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="#353535" />
+
+    <corners android:radius="23dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+</shape>
--- a/res/drawable/profile_picture_view_small_background.xml
+++ b/res/drawable/profile_picture_view_small_background.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/unimportant" />
+
+    <corners android:radius="18dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+</shape>
--- a/res/drawable/profile_picture_view_small_foreground.xml
+++ b/res/drawable/profile_picture_view_small_foreground.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/transparent" />
+
+    <corners android:radius="18dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+</shape>
--- a/res/drawable/prominent_dialog_button_background.xml
+++ b/res/drawable/prominent_dialog_button_background.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/accent" />
+
+    <corners android:radius="@dimen/dialog_button_corner_radius" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/accent" />
+</shape>
--- a/res/drawable/prominent_filled_button_medium_background.xml
+++ b/res/drawable/prominent_filled_button_medium_background.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/accent" />
+
+    <corners android:radius="22dp" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/accent" />
+</shape>
--- a/res/drawable/prominent_outline_button_medium_background.xml
+++ b/res/drawable/prominent_outline_button_medium_background.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/transparent" />
+
+    <corners android:radius="22dp" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/accent" />
+</shape>
--- a/res/drawable/scroll_to_bottom_button_background.xml
+++ b/res/drawable/scroll_to_bottom_button_background.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/compose_view_background" />
+</shape>
--- a/res/drawable/session_edit_text_background.xml
+++ b/res/drawable/session_edit_text_background.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <stroke
+        android:color="@color/text"
+        android:width="@dimen/border_thickness" />
+
+    <corners android:radius="@dimen/text_view_corner_radius" />
+
+</shape>
--- a/res/drawable/session_edit_text_cursor.xml
+++ b/res/drawable/session_edit_text_cursor.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <size android:width="2dp" />
+
+    <solid android:color="@color/accent"  />
+
+</shape>
--- a/res/drawable/session_id_text_view_background.xml
+++ b/res/drawable/session_id_text_view_background.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <stroke
+        android:color="@color/text"
+        android:width="@dimen/border_thickness" />
+
+    <corners android:radius="@dimen/text_view_corner_radius" />
+
+</shape>
--- a/res/drawable/session_logo.xml
+++ b/res/drawable/session_logo.xml
@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="448.40668"
+    android:viewportWidth="404.08533" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0L404.085,0L404.085,448.407L0,448.407Z M 0,0"/>
+        <path android:fillAlpha="1" android:fillColor="#00f782"
+            android:fillType="nonZero"
+            android:pathData="m288.607,420.376l-196.335,-0c-33.576,-0 -62.508,-25.748 -64.164,-59.281 -1.771,-35.847 26.883,-65.576 62.353,-65.576l113.072,-0c6.919,-0 12.527,-5.608 12.527,-12.525l0,-92.305L327.307,252.333C356.723,268.633 375.241,299.335 376.027,332.848 377.161,380.975 336.746,420.376 288.607,420.376m-211.829,-224.303c-29.416,-16.3 -47.933,-47.001 -48.721,-80.515 -1.132,-48.127 39.283,-87.528 87.42,-87.528L311.811,28.031c33.576,-0 62.508,25.748 64.165,59.283 1.771,35.845 -26.883,65.575 -62.352,65.575 0,-0 -81.316,0.013 -113.077,0.019 -6.915,0.001 -12.499,5.608 -12.501,12.523l-0.021,92.289zM340.891,227.816 L256.254,180.919l57.371,-0c49.877,-0 90.46,-40.579 90.46,-90.457 0,-49.877 -40.583,-90.461 -90.46,-90.461l-200.299,-0c-62.485,-0 -113.327,50.841 -113.327,113.327 0,44.567 24.216,85.664 63.195,107.265l84.636,46.896l-57.368,-0c-49.88,-0 -90.463,40.58 -90.463,90.457 0,49.877 40.583,90.461 90.463,90.461L290.758,448.407c62.488,-0 113.327,-50.84 113.327,-113.327 0,-44.567 -24.216,-85.664 -63.193,-107.264" android:strokeColor="#00000000"/>
+    </group>
+</vector>
--- a/res/drawable/session_logo_white.xml
+++ b/res/drawable/session_logo_white.xml
@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="448.40668"
+    android:viewportWidth="404.08533" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0L404.085,0L404.085,448.407L0,448.407Z M 0,0"/>
+        <path android:fillAlpha="1" android:fillColor="#ffffff"
+            android:fillType="nonZero"
+            android:pathData="m288.607,420.376l-196.335,-0c-33.576,-0 -62.508,-25.748 -64.164,-59.281 -1.771,-35.847 26.883,-65.576 62.353,-65.576l113.072,-0c6.919,-0 12.527,-5.608 12.527,-12.525l0,-92.305L327.307,252.333C356.723,268.633 375.241,299.335 376.027,332.848 377.161,380.975 336.746,420.376 288.607,420.376m-211.829,-224.303c-29.416,-16.3 -47.933,-47.001 -48.721,-80.515 -1.132,-48.127 39.283,-87.528 87.42,-87.528L311.811,28.031c33.576,-0 62.508,25.748 64.165,59.283 1.771,35.845 -26.883,65.575 -62.352,65.575 0,-0 -81.316,0.013 -113.077,0.019 -6.915,0.001 -12.499,5.608 -12.501,12.523l-0.021,92.289zM340.891,227.816 L256.254,180.919l57.371,-0c49.877,-0 90.46,-40.579 90.46,-90.457 0,-49.877 -40.583,-90.461 -90.46,-90.461l-200.299,-0c-62.485,-0 -113.327,50.841 -113.327,113.327 0,44.567 24.216,85.664 63.195,107.265l84.636,46.896l-57.368,-0c-49.88,-0 -90.463,40.58 -90.463,90.457 0,49.877 40.583,90.461 90.463,90.461L290.758,448.407c62.488,-0 113.327,-50.84 113.327,-113.327 0,-44.567 -24.216,-85.664 -63.193,-107.264" android:strokeColor="#00000000"/>
+    </group>
+</vector>
--- a/res/drawable/setting_button_background.xml
+++ b/res/drawable/setting_button_background.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/cell_selected">
+
+    <item>
+        <color android:color="@color/cell_background" />
+    </item>
+</ripple>
--- a/res/drawable/sticky_date_header_background_dark.xml
+++ b/res/drawable/sticky_date_header_background_dark.xml
@ -4,5 +4,6 @@
    android:shape="rectangle">

    <corners android:radius="4dp" />
-    <solid android:color="@color/core_grey_90" />
+
+    <solid android:color="@color/compose_view_background" />
 </shape>
--- a/res/drawable/unimportant_dialog_button_background.xml
+++ b/res/drawable/unimportant_dialog_button_background.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/unimportant_dialog_button_background" />
+
+    <corners android:radius="@dimen/dialog_button_corner_radius" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/unimportant_dialog_button_background" />
+</shape>
--- a/res/drawable/unimportant_filled_button_medium_background.xml
+++ b/res/drawable/unimportant_filled_button_medium_background.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/unimportant_button_background" />
+
+    <corners android:radius="22dp" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/unimportant_button_background" />
+</shape>
--- a/res/drawable/unimportant_outline_button_medium_background.xml
+++ b/res/drawable/unimportant_outline_button_medium_background.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/transparent" />
+
+    <corners android:radius="22dp" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/text" />
+</shape>
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				[{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"arm64-v8a"}],"versionCode":282,"versionName":"1.0.0","enabled":true,"filterName":"arm64-v8a","outputFile":"Signal-play-arm64-v8a-release-1.0.0.apk","fullName":"playArm64-v8aRelease","baseName":"play-arm64-v8a-release"},"path":"Signal-play-arm64-v8a-release-1.0.0.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"armeabi-v7a"}],"versionCode":281,"versionName":"1.0.0","enabled":true,"filterName":"armeabi-v7a","outputFile":"Signal-play-armeabi-v7a-release-1.0.0.apk","fullName":"playArmeabi-v7aRelease","baseName":"play-armeabi-v7a-release"},"path":"Signal-play-armeabi-v7a-release-1.0.0.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[],"versionCode":285,"versionName":"1.0.0","enabled":true,"filterName":"universal","outputFile":"Signal-play-universal-release-1.0.0.apk","fullName":"playUniversalRelease","baseName":"play-universal-release"},"path":"Signal-play-universal-release-1.0.0.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"x86"}],"versionCode":283,"versionName":"1.0.0","enabled":true,"filterName":"x86","outputFile":"Signal-play-x86-release-1.0.0.apk","fullName":"playX86Release","baseName":"play-x86-release"},"path":"Signal-play-x86-release-1.0.0.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"x86_64"}],"versionCode":284,"versionName":"1.0.0","enabled":true,"filterName":"x86_64","outputFile":"Signal-play-x86_64-release-1.0.0.apk","fullName":"playX86_64Release","baseName":"play-x86_64-release"},"path":"Signal-play-x86_64-release-1.0.0.apk","properties":{}}]