From 1e25de64a9c528ca5ea99cdc1bf6563d84d971ef Mon Sep 17 00:00:00 2001
From: BagretsovDm <bagretsovdmitry@gmail.com>
Date: Sat, 17 Dec 2022 18:15:41 +0200
Subject: [PATCH 1/9] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85=20=D1=86=D0=B2=D0=B5=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/colors.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..9561435 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,21 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
+
+    <!-- Light -->
+    <color name="light_background">#FFFFFF</color>
+    <color name="light_main">#263238</color>
+    <color name="light_primary">#2980B9</color>
+    <color name="light_secondary">#2ECC71</color>
+    <color name="light_icon">#979797</color>
+    <color name="light_shade">#F0F0F0</color>
+
+    <!-- Dark -->
+    <color name="dark_background">#121212</color>
+    <color name="dark_main">#E0E0E0</color>
+    <color name="dark_primary">#4FB8FF</color>
+    <color name="dark_secondary">#89ED5B</color>
+    <color name="dark_icon">#888888</color>
+    <color name="dark_shade">#272727</color>
+
+</resources>

From 01edf6bf55a70fa1d51f354294e3159b52c2671f Mon Sep 17 00:00:00 2001
From: BagretsovDm <bagretsovdmitry@gmail.com>
Date: Sat, 17 Dec 2022 18:20:45 +0200
Subject: [PATCH 2/9] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/arrow_back.xml        | 5 +++++
 app/src/main/res/drawable/edit.xml              | 5 +++++
 app/src/main/res/drawable/insert_invitation.xml | 5 +++++
 app/src/main/res/drawable/location.xml          | 5 +++++
 app/src/main/res/drawable/loyalty.xml           | 5 +++++
 app/src/main/res/drawable/person.xml            | 5 +++++
 app/src/main/res/drawable/search.xml            | 5 +++++
 app/src/main/res/drawable/wallet.xml            | 5 +++++
 8 files changed, 40 insertions(+)
 create mode 100644 app/src/main/res/drawable/arrow_back.xml
 create mode 100644 app/src/main/res/drawable/edit.xml
 create mode 100644 app/src/main/res/drawable/insert_invitation.xml
 create mode 100644 app/src/main/res/drawable/location.xml
 create mode 100644 app/src/main/res/drawable/loyalty.xml
 create mode 100644 app/src/main/res/drawable/person.xml
 create mode 100644 app/src/main/res/drawable/search.xml
 create mode 100644 app/src/main/res/drawable/wallet.xml

diff --git a/app/src/main/res/drawable/arrow_back.xml b/app/src/main/res/drawable/arrow_back.xml
new file mode 100644
index 0000000..31e7df2
--- /dev/null
+++ b/app/src/main/res/drawable/arrow_back.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/edit.xml b/app/src/main/res/drawable/edit.xml
new file mode 100644
index 0000000..faddfce
--- /dev/null
+++ b/app/src/main/res/drawable/edit.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/app/src/main/res/drawable/insert_invitation.xml b/app/src/main/res/drawable/insert_invitation.xml
new file mode 100644
index 0000000..037fe33
--- /dev/null
+++ b/app/src/main/res/drawable/insert_invitation.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2h-1L18,1h-2zM19,19L5,19L5,8h14v11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/location.xml b/app/src/main/res/drawable/location.xml
new file mode 100644
index 0000000..e5383d7
--- /dev/null
+++ b/app/src/main/res/drawable/location.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/loyalty.xml b/app/src/main/res/drawable/loyalty.xml
new file mode 100644
index 0000000..776cf9d
--- /dev/null
+++ b/app/src/main/res/drawable/loyalty.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21.41,11.58l-9,-9C12.05,2.22 11.55,2 11,2L4,2c-1.1,0 -2,0.9 -2,2v7c0,0.55 0.22,1.05 0.59,1.42l9,9c0.36,0.36 0.86,0.58 1.41,0.58 0.55,0 1.05,-0.22 1.41,-0.59l7,-7c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-0.55 -0.23,-1.06 -0.59,-1.42zM5.5,7C4.67,7 4,6.33 4,5.5S4.67,4 5.5,4 7,4.67 7,5.5 6.33,7 5.5,7zM17.27,15.27L13,19.54l-4.27,-4.27C8.28,14.81 8,14.19 8,13.5c0,-1.38 1.12,-2.5 2.5,-2.5 0.69,0 1.32,0.28 1.77,0.74l0.73,0.72 0.73,-0.73c0.45,-0.45 1.08,-0.73 1.77,-0.73 1.38,0 2.5,1.12 2.5,2.5 0,0.69 -0.28,1.32 -0.73,1.77z"/>
+</vector>
diff --git a/app/src/main/res/drawable/person.xml b/app/src/main/res/drawable/person.xml
new file mode 100644
index 0000000..bd8dc80
--- /dev/null
+++ b/app/src/main/res/drawable/person.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/search.xml b/app/src/main/res/drawable/search.xml
new file mode 100644
index 0000000..e2dd96c
--- /dev/null
+++ b/app/src/main/res/drawable/search.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/wallet.xml b/app/src/main/res/drawable/wallet.xml
new file mode 100644
index 0000000..905bf8e
--- /dev/null
+++ b/app/src/main/res/drawable/wallet.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21,18v1c0,1.1 -0.9,2 -2,2L5,21c-1.11,0 -2,-0.9 -2,-2L3,5c0,-1.1 0.89,-2 2,-2h14c1.1,0 2,0.9 2,2v1h-9c-1.11,0 -2,0.9 -2,2v8c0,1.1 0.89,2 2,2h9zM12,16h10L22,8L12,8v8zM16,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>

From 83e392d9c3ca388eec433de45426e48f70acf1b6 Mon Sep 17 00:00:00 2001
From: BagretsovDm <bagretsovdmitry@gmail.com>
Date: Sat, 17 Dec 2022 20:16:13 +0200
Subject: [PATCH 3/9] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=88=D1=80=D0=B8=D1=84=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=B8=20=D1=81=D1=82=D0=B8=D0=BB=D0=B5=D0=B9=20=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/font/roboto_medium.xml     |  7 +++++++
 app/src/main/res/values/customStyles.xml    | 16 ++++++++++++++++
 app/src/main/res/values/font_certs.xml      | 17 +++++++++++++++++
 app/src/main/res/values/preloaded_fonts.xml |  6 ++++++
 4 files changed, 46 insertions(+)
 create mode 100644 app/src/main/res/font/roboto_medium.xml
 create mode 100644 app/src/main/res/values/customStyles.xml
 create mode 100644 app/src/main/res/values/font_certs.xml
 create mode 100644 app/src/main/res/values/preloaded_fonts.xml

diff --git a/app/src/main/res/font/roboto_medium.xml b/app/src/main/res/font/roboto_medium.xml
new file mode 100644
index 0000000..59df90b
--- /dev/null
+++ b/app/src/main/res/font/roboto_medium.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="name=Roboto&amp;weight=500"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
diff --git a/app/src/main/res/values/customStyles.xml b/app/src/main/res/values/customStyles.xml
new file mode 100644
index 0000000..172f77e
--- /dev/null
+++ b/app/src/main/res/values/customStyles.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Typography -->
+    <style name="H6">
+        <item name="android:textSize">20sp</item>
+    </style>
+    <style name="Body1">
+        <item name="android:textSize">16sp</item>
+    </style>
+    <style name="Button">
+        <item name="android:textSize">14sp</item>
+    </style>
+    <style name="Caption">
+        <item name="android:textSize">12sp</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml
new file mode 100644
index 0000000..d2226ac
--- /dev/null
+++ b/app/src/main/res/values/font_certs.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="com_google_android_gms_fonts_certs">
+        <item>@array/com_google_android_gms_fonts_certs_dev</item>
+        <item>@array/com_google_android_gms_fonts_certs_prod</item>
+    </array>
+    <string-array name="com_google_android_gms_fonts_certs_dev">
+        <item>
+            MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
+        </item>
+    </string-array>
+    <string-array name="com_google_android_gms_fonts_certs_prod">
+        <item>
+            MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
+        </item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml
new file mode 100644
index 0000000..3ad41da
--- /dev/null
+++ b/app/src/main/res/values/preloaded_fonts.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="preloaded_fonts" translatable="false">
+        <item>@font/roboto_medium</item>
+    </array>
+</resources>

From 93e0cda95ec1e3d9896dda3a088e55c9f8d6577e Mon Sep 17 00:00:00 2001
From: BagretsovDm <bagretsovdmitry@gmail.com>
Date: Sat, 17 Dec 2022 20:44:48 +0200
Subject: [PATCH 4/9] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20Toolbar=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B5=D0=BD=D1=8E=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20Toolbar=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B8=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20Toolbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_contacts.xml   | 15 ++++++++++++++-
 app/src/main/res/menu/contacts_toolbar_menu.xml | 13 +++++++++++++
 app/src/main/res/values/attr.xml                | 11 +++++++++++
 app/src/main/res/values/customStyles.xml        | 11 +++++++++++
 app/src/main/res/values/themes.xml              | 13 ++++++++++---
 5 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/menu/contacts_toolbar_menu.xml
 create mode 100644 app/src/main/res/values/attr.xml

diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml
index 6ef087b..2cf09c6 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -4,6 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/appBackground"
     tools:context=".ContactsActivity">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            style="@style/CustomToolbarStyle"
+            app:menu="@menu/contacts_toolbar_menu"
+            app:title="Contacts" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/contacts_toolbar_menu.xml b/app/src/main/res/menu/contacts_toolbar_menu.xml
new file mode 100644
index 0000000..051045b
--- /dev/null
+++ b/app/src/main/res/menu/contacts_toolbar_menu.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:icon="@drawable/search"
+        android:iconTint="?attr/iconBackgroundColor"
+        android:title="@string/search"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:title="@string/more"
+        app:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
new file mode 100644
index 0000000..0a9ed77
--- /dev/null
+++ b/app/src/main/res/values/attr.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Dimension -->
+    <attr name="toolbarSize" format="dimension" />
+
+    <!-- Color -->
+    <attr name="appBackground" format="color" />
+    <attr name="toolbarBackground" format="color" />
+    <attr name="iconBackgroundColor" format="color" />
+
+</resources>
diff --git a/app/src/main/res/values/customStyles.xml b/app/src/main/res/values/customStyles.xml
index 172f77e..56c6df5 100644
--- a/app/src/main/res/values/customStyles.xml
+++ b/app/src/main/res/values/customStyles.xml
@@ -13,4 +13,15 @@
     <style name="Caption">
         <item name="android:textSize">12sp</item>
     </style>
+
+    <style name="CustomToolbarStyle" parent="Widget.Material3.Toolbar">
+        <item name="android:layout_height">?attr/toolbarSize</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:background">?attr/toolbarBackground</item>
+        <item name="navigationIcon">@drawable/arrow_back</item>
+        <item name="navigationIconTint">?attr/iconBackgroundColor</item>
+        <item name="titleTextColor">?attr/iconBackgroundColor</item>
+        <item name="titleTextAppearance">@style/H6</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d0b5d4b..8297a7b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.ViewResources" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.ViewResources" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -10,7 +10,14 @@
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">@color/light_primary</item>
         <!-- Customize your theme here. -->
+        <item name="appBackground">@color/light_background</item>
+        <item name="colorControlNormal">@color/light_background</item>
+        <item name="fontFamily">@font/roboto_medium</item>
+        <item name="toolbarSize">56dp</item>
+        <item name="toolbarBackground">@color/light_primary</item>
+        <item name="iconBackgroundColor">@color/light_background</item>
+
     </style>
-</resources>
\ No newline at end of file
+</resources>

From cc69ee01b4b3dc294f97da8446320540d044a897 Mon Sep 17 00:00:00 2001
From: BagretsovDm <bagretsovdmitry@gmail.com>
Date: Sat, 17 Dec 2022 21:13:24 +0200
Subject: [PATCH 5/9] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D1=82=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D1=82=D1=83=D0=BB=D0=B1=D0=B0=D1=80=D0=B0=20=D1=81=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BB=D0=B0=D1=8F=20=D0=B8=20=D1=82=D0=B5=D0=BC?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=82=D0=B5=D0=BC=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                         |  6 +++---
 app/src/main/AndroidManifest.xml         |  4 ++++
 app/src/main/res/drawable/search.xml     |  2 +-
 app/src/main/res/values-night/themes.xml | 12 +++++++++---
 app/src/main/res/values/customStyles.xml |  2 +-
 app/src/main/res/values/strings.xml      |  2 ++
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4332a31..971038a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         applicationId "otus.gpb.homework.viewandresources"
-        minSdk 23
-        targetSdk 32
+        minSdk 26
+        targetSdk 33
         versionCode 1
         versionName "1.0"
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 608e135..daa8228 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,10 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <meta-data
+            android:name="preloaded_fonts"
+            android:resource="@array/preloaded_fonts" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/search.xml b/app/src/main/res/drawable/search.xml
index e2dd96c..87c0ca4 100644
--- a/app/src/main/res/drawable/search.xml
+++ b/app/src/main/res/drawable/search.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/iconBackgroundColor"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 266a56d..9e86eb8 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.ViewResources" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.ViewResources" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -10,7 +10,13 @@
         <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">@color/dark_background</item>
         <!-- Customize your theme here. -->
+        <item name="appBackground">@color/dark_background</item>
+        <item name="colorControlNormal">@color/dark_icon</item>
+        <item name="fontFamily">@font/roboto_medium</item>
+        <item name="toolbarSize">56dp</item>
+        <item name="toolbarBackground">@color/dark_shade</item>
+        <item name="iconBackgroundColor">@color/dark_icon</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/customStyles.xml b/app/src/main/res/values/customStyles.xml
index 56c6df5..9612b49 100644
--- a/app/src/main/res/values/customStyles.xml
+++ b/app/src/main/res/values/customStyles.xml
@@ -20,7 +20,7 @@
         <item name="android:background">?attr/toolbarBackground</item>
         <item name="navigationIcon">@drawable/arrow_back</item>
         <item name="navigationIconTint">?attr/iconBackgroundColor</item>
-        <item name="titleTextColor">?attr/iconBackgroundColor</item>
+        <item name="titleTextColor">@color/light_background</item>
         <item name="titleTextAppearance">@style/H6</item>
     </style>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a7036ac..5fe954c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">View &amp; Resources</string>
+    <string name="search">Search</string>
+    <string name="more">more</string>
 </resources>
\ No newline at end of file

From f99ab7132f68623a6865b1b51f13a282e559c24e Mon Sep 17 00:00:00 2001
From: BagretsovDm <bagretsovdmitry@gmail.com>
Date: Sun, 18 Dec 2022 11:26:27 +0200
Subject: [PATCH 6/9] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D1=82=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D1=82=D1=83=D0=BB=D0=B1=D0=B0=D1=80=D0=B0=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20Cart=20Activity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_cart.xml   | 14 +++++++++++++-
 app/src/main/res/menu/cart_toolbar_menu.xml | 13 +++++++++++++
 app/src/main/res/values/attr.xml            |  3 +++
 app/src/main/res/values/strings.xml         |  1 +
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/menu/cart_toolbar_menu.xml

diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml
index 57dc4d4..267ca32 100644
--- a/app/src/main/res/layout/activity_cart.xml
+++ b/app/src/main/res/layout/activity_cart.xml
@@ -6,4 +6,16 @@
     android:layout_height="match_parent"
     tools:context=".CartActivity">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            style="@style/CustomToolbarStyle"
+            app:menu="@menu/contacts_toolbar_menu"
+            app:title="Cart" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/cart_toolbar_menu.xml b/app/src/main/res/menu/cart_toolbar_menu.xml
new file mode 100644
index 0000000..ac48491
--- /dev/null
+++ b/app/src/main/res/menu/cart_toolbar_menu.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:icon="@drawable/loyalty"
+        android:iconTint="?attr/iconBackgroundColor"
+        android:title="@string/loyalty"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:title="@string/more"
+        app:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 0a9ed77..7e983e4 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -2,6 +2,9 @@
 <resources>
     <!-- Dimension -->
     <attr name="toolbarSize" format="dimension" />
+    <attr name="marginTop" format="dimension" />
+    <attr name="marginSide" format="dimension" />
+    <attr name="marginBottom" format="dimension" />
 
     <!-- Color -->
     <attr name="appBackground" format="color" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5fe954c..fb0fd99 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,4 +2,5 @@
     <string name="app_name">View &amp; Resources</string>
     <string name="search">Search</string>
     <string name="more">more</string>
+    <string name="loyalty">Loyalty</string>
 </resources>
\ No newline at end of file

From c54290b93291bc08775982746f52ee9c87359044 Mon Sep 17 00:00:00 2001
From: BagretsovDm <bagretsovdmitry@gmail.com>
Date: Sun, 18 Dec 2022 13:46:30 +0200
Subject: [PATCH 7/9] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D1=82=D0=BA=D0=B0?=
 =?UTF-8?q?=20Contacts=20Activity=20=D1=81=D0=B2=D0=B5=D1=82=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=8F=20=D0=B8=20=D1=82=D0=B5=D0=BC=D0=BD=D0=B0=D1=8F=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/call.xml            |   5 +
 app/src/main/res/drawable/loyalty.xml         |   2 +-
 app/src/main/res/drawable/search.xml          |   2 +-
 app/src/main/res/layout/activity_contacts.xml | 148 ++++++++++++++++++
 app/src/main/res/menu/cart_toolbar_menu.xml   |   2 +-
 .../main/res/menu/contacts_toolbar_menu.xml   |   2 +-
 app/src/main/res/values-night/themes.xml      |  17 +-
 app/src/main/res/values/attr.xml              |  10 +-
 app/src/main/res/values/customStyles.xml      |  42 ++++-
 app/src/main/res/values/strings.xml           |  18 +++
 app/src/main/res/values/themes.xml            |  18 ++-
 11 files changed, 250 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/res/drawable/call.xml

diff --git a/app/src/main/res/drawable/call.xml b/app/src/main/res/drawable/call.xml
new file mode 100644
index 0000000..2aba8ad
--- /dev/null
+++ b/app/src/main/res/drawable/call.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20.01,15.38c-1.23,0 -2.42,-0.2 -3.53,-0.56 -0.35,-0.12 -0.74,-0.03 -1.01,0.24l-1.57,1.97c-2.83,-1.35 -5.48,-3.9 -6.89,-6.83l1.95,-1.66c0.27,-0.28 0.35,-0.67 0.24,-1.02 -0.37,-1.11 -0.56,-2.3 -0.56,-3.53 0,-0.54 -0.45,-0.99 -0.99,-0.99H4.19C3.65,3 3,3.24 3,3.99 3,13.28 10.73,21 20.01,21c0.71,0 0.99,-0.63 0.99,-1.18v-3.45c0,-0.54 -0.45,-0.99 -0.99,-0.99z"/>
+</vector>
diff --git a/app/src/main/res/drawable/loyalty.xml b/app/src/main/res/drawable/loyalty.xml
index 776cf9d..a89d963 100644
--- a/app/src/main/res/drawable/loyalty.xml
+++ b/app/src/main/res/drawable/loyalty.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/toolbarIconColor"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M21.41,11.58l-9,-9C12.05,2.22 11.55,2 11,2L4,2c-1.1,0 -2,0.9 -2,2v7c0,0.55 0.22,1.05 0.59,1.42l9,9c0.36,0.36 0.86,0.58 1.41,0.58 0.55,0 1.05,-0.22 1.41,-0.59l7,-7c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-0.55 -0.23,-1.06 -0.59,-1.42zM5.5,7C4.67,7 4,6.33 4,5.5S4.67,4 5.5,4 7,4.67 7,5.5 6.33,7 5.5,7zM17.27,15.27L13,19.54l-4.27,-4.27C8.28,14.81 8,14.19 8,13.5c0,-1.38 1.12,-2.5 2.5,-2.5 0.69,0 1.32,0.28 1.77,0.74l0.73,0.72 0.73,-0.73c0.45,-0.45 1.08,-0.73 1.77,-0.73 1.38,0 2.5,1.12 2.5,2.5 0,0.69 -0.28,1.32 -0.73,1.77z"/>
diff --git a/app/src/main/res/drawable/search.xml b/app/src/main/res/drawable/search.xml
index 87c0ca4..4b331b7 100644
--- a/app/src/main/res/drawable/search.xml
+++ b/app/src/main/res/drawable/search.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="?attr/iconBackgroundColor"
+<vector android:height="24dp" android:tint="?attr/toolbarIconColor"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml
index 2cf09c6..2e3f6d5 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -8,6 +8,7 @@
     tools:context=".ContactsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent">
@@ -19,4 +20,151 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/input_name"
+        style="@style/CustomTextInputStyle"
+        android:hint="@string/name"
+        app:endIconDrawable="@drawable/person"
+        app:endIconMode="custom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/input_phone_number"
+        style="@style/CustomTextInputStyle"
+        android:hint="@string/phone_number"
+        app:endIconDrawable="@drawable/call"
+        app:endIconMode="custom"
+        app:layout_constraintEnd_toStartOf="@id/select"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/input_name">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/select"
+        style="@style/CustomDropDownMenuStyle"
+        android:layout_marginEnd="?attr/marginSide"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/input_name">
+
+        <AutoCompleteTextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:hint="@string/select"
+            android:inputType="none"
+            app:simpleItems="@array/select_items" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/input_address"
+        style="@style/CustomTextInputStyle"
+        android:hint="@string/address"
+        app:endIconDrawable="@drawable/location"
+        app:endIconMode="custom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/input_phone_number">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/input_city"
+        style="@style/CustomTextInputStyle"
+        android:hint="@string/city"
+        app:layout_constraintEnd_toStartOf="@id/state"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/input_address">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/state"
+        style="@style/CustomDropDownMenuStyle"
+        app:layout_constraintEnd_toStartOf="@id/input_zip"
+        app:layout_constraintStart_toEndOf="@id/input_city"
+        app:layout_constraintTop_toBottomOf="@id/input_address">
+
+        <AutoCompleteTextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:hint="@string/state"
+            android:inputType="none"
+            app:simpleItems="@array/select_items" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/input_zip"
+        style="@style/CustomTextInputStyle"
+        android:hint="@string/zip"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/state"
+        app:layout_constraintTop_toBottomOf="@id/input_address">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/input_birthday"
+        style="@style/CustomTextInputStyle"
+        android:hint="@string/birthday"
+        app:endIconDrawable="@drawable/insert_invitation"
+        app:endIconMode="custom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/input_city">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/input_notes"
+        style="@style/CustomTextInputStyle"
+        android:hint="@string/notes"
+        app:endIconDrawable="@drawable/edit"
+        app:endIconMode="custom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/input_birthday">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomRegisterButtonStyle"
+        android:text="@string/register"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/cart_toolbar_menu.xml b/app/src/main/res/menu/cart_toolbar_menu.xml
index ac48491..ecb654d 100644
--- a/app/src/main/res/menu/cart_toolbar_menu.xml
+++ b/app/src/main/res/menu/cart_toolbar_menu.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:icon="@drawable/loyalty"
-        android:iconTint="?attr/iconBackgroundColor"
+        android:iconTint="?attr/toolbarIconColor"
         android:title="@string/loyalty"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/contacts_toolbar_menu.xml b/app/src/main/res/menu/contacts_toolbar_menu.xml
index 051045b..38532b0 100644
--- a/app/src/main/res/menu/contacts_toolbar_menu.xml
+++ b/app/src/main/res/menu/contacts_toolbar_menu.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:icon="@drawable/search"
-        android:iconTint="?attr/iconBackgroundColor"
+        android:iconTint="?attr/toolbarIconColor"
         android:title="@string/search"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 9e86eb8..0038534 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -12,11 +12,22 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@color/dark_background</item>
         <!-- Customize your theme here. -->
+        <item name="fontFamily">@font/roboto_medium</item>
+
+        <item name="toolbarHeight">56dp</item>
+        <item name="textInputHeight">54dp</item>
+        <item name="marginTop">24dp</item>
+        <item name="marginSide">16dp</item>
+        <item name="marginBottom">16dp</item>
+
         <item name="appBackground">@color/dark_background</item>
         <item name="colorControlNormal">@color/dark_icon</item>
-        <item name="fontFamily">@font/roboto_medium</item>
-        <item name="toolbarSize">56dp</item>
         <item name="toolbarBackground">@color/dark_shade</item>
-        <item name="iconBackgroundColor">@color/dark_icon</item>
+        <item name="toolbarIconColor">@color/dark_icon</item>
+        <item name="textBoxBackgroundColor">@color/dark_shade</item>
+        <item name="textInputIconColor">@color/dark_icon</item>
+        <item name="textColor">@color/dark_main</item>
+        <item name="buttonBackgroundColor">@color/dark_primary</item>
+        <item name="buttonTextColor">@color/dark_background</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 7e983e4..a742516 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Dimension -->
-    <attr name="toolbarSize" format="dimension" />
+    <attr name="toolbarHeight" format="dimension" />
+    <attr name="textInputHeight" format="dimension" />
     <attr name="marginTop" format="dimension" />
     <attr name="marginSide" format="dimension" />
     <attr name="marginBottom" format="dimension" />
@@ -9,6 +10,11 @@
     <!-- Color -->
     <attr name="appBackground" format="color" />
     <attr name="toolbarBackground" format="color" />
-    <attr name="iconBackgroundColor" format="color" />
+    <attr name="toolbarIconColor" format="color" />
+    <attr name="textBoxBackgroundColor" format="color" />
+    <attr name="textInputIconColor" format="color" />
+    <attr name="textColor" format="color" />
+    <attr name="buttonBackgroundColor" format="color"/>
+    <attr name="buttonTextColor" format="color" />
 
 </resources>
diff --git a/app/src/main/res/values/customStyles.xml b/app/src/main/res/values/customStyles.xml
index 9612b49..9a04ff8 100644
--- a/app/src/main/res/values/customStyles.xml
+++ b/app/src/main/res/values/customStyles.xml
@@ -3,25 +3,61 @@
     <!-- Typography -->
     <style name="H6">
         <item name="android:textSize">20sp</item>
+        <item name="android:textColor">@color/light_background</item>
     </style>
+
     <style name="Body1">
         <item name="android:textSize">16sp</item>
+        <item name="android:textColor">?attr/textColor</item>
     </style>
+
     <style name="Button">
         <item name="android:textSize">14sp</item>
+        <item name="textAllCaps">true</item>
     </style>
+
     <style name="Caption">
         <item name="android:textSize">12sp</item>
     </style>
 
     <style name="CustomToolbarStyle" parent="Widget.Material3.Toolbar">
-        <item name="android:layout_height">?attr/toolbarSize</item>
+        <item name="android:layout_height">?attr/toolbarHeight</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:background">?attr/toolbarBackground</item>
         <item name="navigationIcon">@drawable/arrow_back</item>
-        <item name="navigationIconTint">?attr/iconBackgroundColor</item>
-        <item name="titleTextColor">@color/light_background</item>
+        <item name="navigationIconTint">?attr/toolbarIconColor</item>
         <item name="titleTextAppearance">@style/H6</item>
     </style>
 
+    <style name="CustomTextInputStyle" parent="@style/Widget.Material3.TextInputLayout.FilledBox">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">?attr/textInputHeight</item>
+        <item name="android:layout_marginStart">?attr/marginSide</item>
+        <item name="android:layout_marginEnd">?attr/marginSide</item>
+        <item name="android:layout_marginTop">?attr/marginTop</item>
+        <item name="boxBackgroundColor">?attr/textBoxBackgroundColor</item>
+        <item name="endIconTint">?attr/textInputIconColor</item>
+        <item name="hintTextAppearance">@style/Body1</item>
+    </style>
+    
+    <style name="CustomDropDownMenuStyle" parent="Widget.Material3.TextInputLayout.FilledBox.Dense.ExposedDropdownMenu">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">?attr/textInputHeight</item>
+        <item name="android:layout_marginTop">?attr/marginTop</item>
+        <item name="boxBackgroundColor">?attr/textBoxBackgroundColor</item>
+    </style>
+
+    <style name="CustomRegisterButtonStyle" parent="@style/Widget.Material3.Button">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginStart">?attr/marginSide</item>
+        <item name="android:layout_marginEnd">?attr/marginSide</item>
+        <item name="android:layout_marginBottom">?attr/marginBottom</item>
+        <item name="android:textColor">?attr/buttonTextColor</item>
+        <item name="android:textAppearance">@style/Button</item>
+        <item name="cornerRadius">4dp</item>
+        <item name="backgroundTint">?attr/buttonBackgroundColor</item>
+        <item name="elevation">2dp</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fb0fd99..52b7214 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,4 +3,22 @@
     <string name="search">Search</string>
     <string name="more">more</string>
     <string name="loyalty">Loyalty</string>
+    <string name="name">Name</string>
+    <string name="register">register</string>
+    <string name="phone_number">Phone number</string>
+    <string name="select">Select</string>
+    <string name="address">Address</string>
+    <string name="city">City</string>
+    <string name="zip">Zip</string>
+    <string name="state">State</string>
+    <string name="birthday">Birthday</string>
+    <string name="notes">Notes</string>
+
+    <string-array name="select_items">
+        <item>Item 1</item>
+        <item>Item 2</item>
+        <item>Item 3</item>
+        <item>Item 4</item>
+        <item>Item 5</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8297a7b..a237d6d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -12,12 +12,22 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@color/light_primary</item>
         <!-- Customize your theme here. -->
+        <item name="fontFamily">@font/roboto_medium</item>
+
+        <item name="toolbarHeight">56dp</item>
+        <item name="textInputHeight">54dp</item>
+        <item name="marginTop">24dp</item>
+        <item name="marginSide">16dp</item>
+        <item name="marginBottom">16dp</item>
+
         <item name="appBackground">@color/light_background</item>
         <item name="colorControlNormal">@color/light_background</item>
-        <item name="fontFamily">@font/roboto_medium</item>
-        <item name="toolbarSize">56dp</item>
         <item name="toolbarBackground">@color/light_primary</item>
-        <item name="iconBackgroundColor">@color/light_background</item>
-
+        <item name="toolbarIconColor">@color/light_background</item>
+        <item name="textBoxBackgroundColor">@color/light_shade</item>
+        <item name="textInputIconColor">@color/light_icon</item>
+        <item name="textColor">@color/light_main</item>
+        <item name="buttonBackgroundColor">@color/light_secondary</item>
+        <item name="buttonTextColor">@color/light_background</item>
     </style>
 </resources>

From bbb4b9d344168af0222bf52b6505f869d57d3776 Mon Sep 17 00:00:00 2001
From: BagretsovDm <bagretsovdmitry@gmail.com>
Date: Sun, 18 Dec 2022 16:51:30 +0200
Subject: [PATCH 8/9] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D1=82=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3=D0=B0=20=D1=81=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BB=D0=B0=D1=8F=20=D0=B8=20=D1=82=D0=B5=D0=BC?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=82=D0=B5=D0=BC=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_contacts.xml |  2 +
 app/src/main/res/layout/dialog_signin.xml     | 83 ++++++++++++++++++-
 app/src/main/res/values-night/themes.xml      |  2 +
 app/src/main/res/values/attr.xml              |  2 +
 app/src/main/res/values/customStyles.xml      | 17 ++--
 app/src/main/res/values/strings.xml           |  4 +
 app/src/main/res/values/themes.xml            |  2 +
 7 files changed, 104 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml
index 2e3f6d5..9e97dbd 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -162,7 +162,9 @@
 
     <com.google.android.material.button.MaterialButton
         style="@style/CustomRegisterButtonStyle"
+        android:backgroundTint="?attr/buttonBackgroundColor"
         android:text="@string/register"
+        android:layout_margin="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/dialog_signin.xml b/app/src/main/res/layout/dialog_signin.xml
index 77d9ef6..f00aec4 100644
--- a/app/src/main/res/layout/dialog_signin.xml
+++ b/app/src/main/res/layout/dialog_signin.xml
@@ -1,6 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:background="?attr/appBackground">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/sign_in"
+        style="@style/H6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="18dp"
+        android:text="@string/sign_in"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        style="@style/Widget.Material3.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="20dp"
+        android:text="@string/register"
+        android:textAppearance="@style/Button"
+        android:textColor="?attr/dialogButtonColor"
+        app:layout_constraintBottom_toBottomOf="@id/sign_in"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/sign_in" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/input_email"
+        style="@style/CustomDialogTextInputStyle"
+        android:hint="@string/e_mail"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sign_in">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/input_password"
+        style="@style/CustomDialogTextInputStyle"
+        android:hint="@string/password"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/input_email">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <Button
+        android:id="@+id/reset_button"
+        style="@style/Widget.Material3.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:text="@string/reset_my_password"
+        android:textAppearance="@style/Caption"
+        android:textColor="?attr/resetButtonColor"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/input_password" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/signin_button"
+        style="@style/CustomRegisterButtonStyle"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="16dp"
+        android:backgroundTint="?attr/dialogButtonColor"
+        android:text="@string/sign_in"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/reset_button" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 0038534..bb7c3a9 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -29,5 +29,7 @@
         <item name="textColor">@color/dark_main</item>
         <item name="buttonBackgroundColor">@color/dark_primary</item>
         <item name="buttonTextColor">@color/dark_background</item>
+        <item name="dialogButtonColor">@color/dark_primary</item>
+        <item name="resetButtonColor">@color/dark_main</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index a742516..0442067 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -16,5 +16,7 @@
     <attr name="textColor" format="color" />
     <attr name="buttonBackgroundColor" format="color"/>
     <attr name="buttonTextColor" format="color" />
+    <attr name="dialogButtonColor" format="color" />
+    <attr name="resetButtonColor" format="color" />
 
 </resources>
diff --git a/app/src/main/res/values/customStyles.xml b/app/src/main/res/values/customStyles.xml
index 9a04ff8..d43b1e3 100644
--- a/app/src/main/res/values/customStyles.xml
+++ b/app/src/main/res/values/customStyles.xml
@@ -3,7 +3,6 @@
     <!-- Typography -->
     <style name="H6">
         <item name="android:textSize">20sp</item>
-        <item name="android:textColor">@color/light_background</item>
     </style>
 
     <style name="Body1">
@@ -26,6 +25,7 @@
         <item name="android:background">?attr/toolbarBackground</item>
         <item name="navigationIcon">@drawable/arrow_back</item>
         <item name="navigationIconTint">?attr/toolbarIconColor</item>
+        <item name="titleTextColor">@color/light_background</item>
         <item name="titleTextAppearance">@style/H6</item>
     </style>
 
@@ -39,7 +39,7 @@
         <item name="endIconTint">?attr/textInputIconColor</item>
         <item name="hintTextAppearance">@style/Body1</item>
     </style>
-    
+
     <style name="CustomDropDownMenuStyle" parent="Widget.Material3.TextInputLayout.FilledBox.Dense.ExposedDropdownMenu">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">?attr/textInputHeight</item>
@@ -50,14 +50,19 @@
     <style name="CustomRegisterButtonStyle" parent="@style/Widget.Material3.Button">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginStart">?attr/marginSide</item>
-        <item name="android:layout_marginEnd">?attr/marginSide</item>
-        <item name="android:layout_marginBottom">?attr/marginBottom</item>
         <item name="android:textColor">?attr/buttonTextColor</item>
         <item name="android:textAppearance">@style/Button</item>
         <item name="cornerRadius">4dp</item>
-        <item name="backgroundTint">?attr/buttonBackgroundColor</item>
         <item name="elevation">2dp</item>
     </style>
 
+    <style name="CustomDialogTextInputStyle" parent="Widget.Material3.TextInputLayout.OutlinedBox">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">18dp</item>
+        <item name="android:layout_marginStart">24dp</item>
+        <item name="android:layout_marginEnd">24dp</item>
+        <item name="android:textAppearance">@style/Body1</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 52b7214..b7a9d86 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,10 @@
     <string name="state">State</string>
     <string name="birthday">Birthday</string>
     <string name="notes">Notes</string>
+    <string name="sign_in">Sign in</string>
+    <string name="e_mail">E-mail</string>
+    <string name="password">Password</string>
+    <string name="reset_my_password">Reset my password</string>
 
     <string-array name="select_items">
         <item>Item 1</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a237d6d..cb469eb 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -29,5 +29,7 @@
         <item name="textColor">@color/light_main</item>
         <item name="buttonBackgroundColor">@color/light_secondary</item>
         <item name="buttonTextColor">@color/light_background</item>
+        <item name="dialogButtonColor">@color/light_primary</item>
+        <item name="resetButtonColor">@color/light_primary</item>
     </style>
 </resources>

From a0e75458d95b2f545cde2e279ffca704059f6a93 Mon Sep 17 00:00:00 2001
From: BagretsovDm <bagretsovdmitry@gmail.com>
Date: Sun, 18 Dec 2022 20:18:53 +0200
Subject: [PATCH 9/9] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D1=82=D0=BA=D0=B0?=
 =?UTF-8?q?=20Cart=20Activity=20=D0=B8=20=D1=82=D0=B5=D0=BC=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=8F=20=D1=82=D0=B5=D0=BC=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/drawable-v24/blur_darkred.xml    |  5 +
 app/src/main/res/drawable-v24/blur_red.xml    |  5 +
 app/src/main/res/drawable-v24/blur_yellow.xml |  5 +
 app/src/main/res/drawable/blur_blue.xml       |  5 +
 app/src/main/res/drawable/close.xml           |  5 +
 app/src/main/res/drawable/wallet.xml          |  2 +-
 app/src/main/res/layout/activity_cart.xml     | 92 ++++++++++++++++++-
 app/src/main/res/layout/activity_contacts.xml |  3 +-
 app/src/main/res/layout/first_items.xml       | 49 ++++++++++
 app/src/main/res/layout/fourth_items.xml      | 49 ++++++++++
 app/src/main/res/layout/second_items.xml      | 49 ++++++++++
 app/src/main/res/layout/third_items.xml       | 49 ++++++++++
 app/src/main/res/layout/total_items.xml       | 53 +++++++++++
 app/src/main/res/values-night/themes.xml      |  6 ++
 app/src/main/res/values/attr.xml              |  9 +-
 app/src/main/res/values/colors.xml            |  7 ++
 app/src/main/res/values/customStyles.xml      | 29 +++++-
 app/src/main/res/values/strings.xml           | 17 ++++
 app/src/main/res/values/themes.xml            |  6 ++
 19 files changed, 439 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable-v24/blur_darkred.xml
 create mode 100644 app/src/main/res/drawable-v24/blur_red.xml
 create mode 100644 app/src/main/res/drawable-v24/blur_yellow.xml
 create mode 100644 app/src/main/res/drawable/blur_blue.xml
 create mode 100644 app/src/main/res/drawable/close.xml
 create mode 100644 app/src/main/res/layout/first_items.xml
 create mode 100644 app/src/main/res/layout/fourth_items.xml
 create mode 100644 app/src/main/res/layout/second_items.xml
 create mode 100644 app/src/main/res/layout/third_items.xml
 create mode 100644 app/src/main/res/layout/total_items.xml

diff --git a/app/src/main/res/drawable-v24/blur_darkred.xml b/app/src/main/res/drawable-v24/blur_darkred.xml
new file mode 100644
index 0000000..68bdc5a
--- /dev/null
+++ b/app/src/main/res/drawable-v24/blur_darkred.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="@color/blur_dark_red"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM3,9.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM6,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,10.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM14,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM14,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM3,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM10,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM10,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM18,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM14,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM10,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM14,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable-v24/blur_red.xml b/app/src/main/res/drawable-v24/blur_red.xml
new file mode 100644
index 0000000..136f826
--- /dev/null
+++ b/app/src/main/res/drawable-v24/blur_red.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="@color/blur_red"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM3,9.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM6,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,10.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM14,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM14,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM3,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM10,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM10,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM18,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM14,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM10,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM14,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable-v24/blur_yellow.xml b/app/src/main/res/drawable-v24/blur_yellow.xml
new file mode 100644
index 0000000..2153632
--- /dev/null
+++ b/app/src/main/res/drawable-v24/blur_yellow.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="@color/blur_yellow"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM3,9.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM6,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,10.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM14,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM14,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM3,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM10,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM10,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM18,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM14,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM10,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM14,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/blur_blue.xml b/app/src/main/res/drawable/blur_blue.xml
new file mode 100644
index 0000000..ffa1fca
--- /dev/null
+++ b/app/src/main/res/drawable/blur_blue.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="@color/blur_blue"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM3,9.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM6,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,10.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM14,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM14,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM3,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM10,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM10,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM18,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM14,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM10,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM14,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/close.xml b/app/src/main/res/drawable/close.xml
new file mode 100644
index 0000000..dc1f369
--- /dev/null
+++ b/app/src/main/res/drawable/close.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?attr/closeIconColor"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/wallet.xml b/app/src/main/res/drawable/wallet.xml
index 905bf8e..edd53b4 100644
--- a/app/src/main/res/drawable/wallet.xml
+++ b/app/src/main/res/drawable/wallet.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/walletIconColor"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M21,18v1c0,1.1 -0.9,2 -2,2L5,21c-1.11,0 -2,-0.9 -2,-2L3,5c0,-1.1 0.89,-2 2,-2h14c1.1,0 2,0.9 2,2v1h-9c-1.11,0 -2,0.9 -2,2v8c0,1.1 0.89,2 2,2h9zM12,16h10L22,8L12,8v8zM16,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml
index 267ca32..ab3229a 100644
--- a/app/src/main/res/layout/activity_cart.xml
+++ b/app/src/main/res/layout/activity_cart.xml
@@ -4,18 +4,108 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/appBackground"
     tools:context=".CartActivity">
 
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/cart_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?attr/cartToolBarColor"
         app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.appbar.MaterialToolbar
             style="@style/CustomToolbarStyle"
-            app:menu="@menu/contacts_toolbar_menu"
+            app:menu="@menu/cart_toolbar_menu"
             app:title="Cart" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/items_in_cart"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:text="@string/items_in_cart"
+        android:textAppearance="@style/Body2"
+        android:textColor="?attr/itemsInCartColor"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/cart_toolbar" />
+
+    <include
+        android:id="@+id/first"
+        layout="@layout/first_items"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/items_in_cart" />
+
+    <include
+        android:id="@+id/second"
+        layout="@layout/second_items"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/first" />
+
+    <include
+        android:id="@+id/third"
+        layout="@layout/third_items"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/second" />
+
+    <include
+        android:id="@+id/fourth"
+        layout="@layout/fourth_items"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/third" />
+
+    <com.google.android.material.divider.MaterialDivider
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        app:dividerColor="?attr/textColor"
+        app:dividerThickness="1dp"
+        app:layout_constraintBottom_toTopOf="@id/total_include" />
+
+    <include
+        android:id="@+id/total_include"
+        layout="@layout/total_items"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/pay_button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/pay_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:backgroundTint="?attr/walletButtonColor"
+        android:paddingStart="26dp"
+        android:paddingTop="19dp"
+        android:paddingBottom="19dp"
+        android:text="@string/pay_now"
+        android:textAppearance="@style/H6"
+        android:textColor="?attr/appBackground"
+        app:icon="@drawable/wallet"
+        app:iconSize="18dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="RtlSymmetry" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml
index 9e97dbd..3030435 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -11,6 +11,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?attr/toolbarBackground"
         app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.appbar.MaterialToolbar
@@ -162,9 +163,9 @@
 
     <com.google.android.material.button.MaterialButton
         style="@style/CustomRegisterButtonStyle"
+        android:layout_margin="16dp"
         android:backgroundTint="?attr/buttonBackgroundColor"
         android:text="@string/register"
-        android:layout_margin="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/first_items.xml b/app/src/main/res/layout/first_items.xml
new file mode 100644
index 0000000..1890a7d
--- /dev/null
+++ b/app/src/main/res/layout/first_items.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/appBackground"
+    android:paddingBottom="16dp">
+
+    <ImageView
+        android:id="@+id/img"
+        style="@style/CustomImageStyle"
+        android:layout_marginTop="12dp"
+        android:contentDescription="@string/image"
+        android:src="@drawable/blur_darkred"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv1"
+        style="@style/CustomTextViewStyle"
+        android:text="@string/on_the_top"
+        app:layout_constraintStart_toEndOf="@id/img"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/caption"
+        style="@style/CustomCaptionTextStyle"
+        android:text="@string/caption"
+        app:layout_constraintStart_toEndOf="@id/img"
+        app:layout_constraintTop_toBottomOf="@id/tv1" />
+
+    <TextView
+        android:id="@+id/price"
+        style="@style/CustomTextViewStyle"
+        android:text="@string/us_1_50"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/caption"
+        app:layout_constraintBottom_toBottomOf="@id/caption"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:src="@drawable/close"
+        android:contentDescription="@string/close" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fourth_items.xml b/app/src/main/res/layout/fourth_items.xml
new file mode 100644
index 0000000..60b0c8a
--- /dev/null
+++ b/app/src/main/res/layout/fourth_items.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/appBackground"
+    android:paddingBottom="16dp">
+
+    <ImageView
+        android:id="@+id/img"
+        style="@style/CustomImageStyle"
+        android:layout_marginTop="12dp"
+        android:contentDescription="@string/image"
+        android:src="@drawable/blur_red"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv1"
+        style="@style/CustomTextViewStyle"
+        android:text="@string/basket_coffee"
+        app:layout_constraintStart_toEndOf="@id/img"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/caption"
+        style="@style/CustomCaptionTextStyle"
+        android:text="@string/caption"
+        app:layout_constraintStart_toEndOf="@id/img"
+        app:layout_constraintTop_toBottomOf="@id/tv1" />
+
+    <TextView
+        android:id="@+id/price"
+        style="@style/CustomTextViewStyle"
+        android:text="@string/us_22_00"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/caption"
+        app:layout_constraintBottom_toBottomOf="@id/caption"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:src="@drawable/close"
+        android:contentDescription="@string/close" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/second_items.xml b/app/src/main/res/layout/second_items.xml
new file mode 100644
index 0000000..8cdd942
--- /dev/null
+++ b/app/src/main/res/layout/second_items.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/appBackground"
+    android:paddingBottom="16dp">
+
+    <ImageView
+        android:id="@+id/img"
+        style="@style/CustomImageStyle"
+        android:layout_marginTop="12dp"
+        android:contentDescription="@string/image"
+        android:src="@drawable/blur_blue"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv1"
+        style="@style/CustomTextViewStyle"
+        android:text="@string/forever_friends"
+        app:layout_constraintStart_toEndOf="@id/img"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/caption"
+        style="@style/CustomCaptionTextStyle"
+        android:text="@string/caption"
+        app:layout_constraintStart_toEndOf="@id/img"
+        app:layout_constraintTop_toBottomOf="@id/tv1" />
+
+    <TextView
+        android:id="@+id/price"
+        style="@style/CustomTextViewStyle"
+        android:text="@string/us_4_50"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/caption"
+        app:layout_constraintBottom_toBottomOf="@id/caption"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:src="@drawable/close"
+        android:contentDescription="@string/close" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/third_items.xml b/app/src/main/res/layout/third_items.xml
new file mode 100644
index 0000000..5ff2b60
--- /dev/null
+++ b/app/src/main/res/layout/third_items.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/appBackground"
+    android:paddingBottom="16dp">
+
+    <ImageView
+        android:id="@+id/img"
+        style="@style/CustomImageStyle"
+        android:layout_marginTop="12dp"
+        android:contentDescription="@string/image"
+        android:src="@drawable/blur_yellow"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv1"
+        style="@style/CustomTextViewStyle"
+        android:text="@string/prototyping_kit"
+        app:layout_constraintStart_toEndOf="@id/img"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/caption"
+        style="@style/CustomCaptionTextStyle"
+        android:text="@string/caption"
+        app:layout_constraintStart_toEndOf="@id/img"
+        app:layout_constraintTop_toBottomOf="@id/tv1" />
+
+    <TextView
+        android:id="@+id/price"
+        style="@style/CustomTextViewStyle"
+        android:text="@string/us_8_00"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/caption"
+        app:layout_constraintBottom_toBottomOf="@id/caption"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:src="@drawable/close"
+        android:contentDescription="@string/close" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/total_items.xml b/app/src/main/res/layout/total_items.xml
new file mode 100644
index 0000000..250e676
--- /dev/null
+++ b/app/src/main/res/layout/total_items.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/appBackground"
+    android:paddingStart="16dp"
+    android:paddingTop="24dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="24dp">
+
+    <TextView
+        android:id="@+id/total"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/your_order_total"
+        android:textAppearance="@style/H6"
+        android:textColor="?attr/totalTextColor"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/total_price"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/_41_24"
+        android:textAppearance="@style/H6"
+        android:textColor="?attr/totalTextColor"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/subtotal"
+        android:textAppearance="@style/Body1"
+        android:textColor="?attr/textColor"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/total" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/_36_00_n2_00_n3_50"
+        android:textAlignment="textEnd"
+        android:textAppearance="@style/Body1"
+        android:textColor="?attr/textColor"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/total" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index bb7c3a9..9b54f0b 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -31,5 +31,11 @@
         <item name="buttonTextColor">@color/dark_background</item>
         <item name="dialogButtonColor">@color/dark_primary</item>
         <item name="resetButtonColor">@color/dark_main</item>
+        <item name="itemsInCartColor">@color/dark_secondary</item>
+        <item name="cartToolBarColor">@color/dark_background</item>
+        <item name="closeIconColor">@color/dark_icon</item>
+        <item name="totalTextColor">@color/dark_tretiary</item>
+        <item name="walletIconColor">@color/dark_background</item>
+        <item name="walletButtonColor">@color/dark_secondary</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 0442067..fd5c597 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -14,9 +14,14 @@
     <attr name="textBoxBackgroundColor" format="color" />
     <attr name="textInputIconColor" format="color" />
     <attr name="textColor" format="color" />
-    <attr name="buttonBackgroundColor" format="color"/>
+    <attr name="buttonBackgroundColor" format="color" />
     <attr name="buttonTextColor" format="color" />
     <attr name="dialogButtonColor" format="color" />
     <attr name="resetButtonColor" format="color" />
-
+    <attr name="itemsInCartColor" format="color" />
+    <attr name="cartToolBarColor" format="color" />
+    <attr name="closeIconColor" format="color" />
+    <attr name="totalTextColor" format="color" />
+    <attr name="walletIconColor" format="color" />
+    <attr name="walletButtonColor" format="color" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9561435..11deee3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,6 +8,11 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
 
+    <color name="blur_yellow">#FFD76F</color>
+    <color name="blur_red">#F47265</color>
+    <color name="blur_blue">#4FB8FF</color>
+    <color name="blur_dark_red">#E74C3C</color>
+
     <!-- Light -->
     <color name="light_background">#FFFFFF</color>
     <color name="light_main">#263238</color>
@@ -15,6 +20,7 @@
     <color name="light_secondary">#2ECC71</color>
     <color name="light_icon">#979797</color>
     <color name="light_shade">#F0F0F0</color>
+    <color name="light_accent">#E74C3C</color>
 
     <!-- Dark -->
     <color name="dark_background">#121212</color>
@@ -23,5 +29,6 @@
     <color name="dark_secondary">#89ED5B</color>
     <color name="dark_icon">#888888</color>
     <color name="dark_shade">#272727</color>
+    <color name="dark_tretiary">#FFD76F</color>
 
 </resources>
diff --git a/app/src/main/res/values/customStyles.xml b/app/src/main/res/values/customStyles.xml
index d43b1e3..2952fdc 100644
--- a/app/src/main/res/values/customStyles.xml
+++ b/app/src/main/res/values/customStyles.xml
@@ -10,6 +10,10 @@
         <item name="android:textColor">?attr/textColor</item>
     </style>
 
+    <style name="Body2">
+        <item name="android:textSize">14sp</item>
+    </style>
+
     <style name="Button">
         <item name="android:textSize">14sp</item>
         <item name="textAllCaps">true</item>
@@ -17,12 +21,12 @@
 
     <style name="Caption">
         <item name="android:textSize">12sp</item>
+        <item name="android:textColor">?attr/textColor</item>
     </style>
 
     <style name="CustomToolbarStyle" parent="Widget.Material3.Toolbar">
         <item name="android:layout_height">?attr/toolbarHeight</item>
         <item name="android:layout_width">match_parent</item>
-        <item name="android:background">?attr/toolbarBackground</item>
         <item name="navigationIcon">@drawable/arrow_back</item>
         <item name="navigationIconTint">?attr/toolbarIconColor</item>
         <item name="titleTextColor">@color/light_background</item>
@@ -65,4 +69,27 @@
         <item name="android:textAppearance">@style/Body1</item>
     </style>
 
+    <style name="CustomImageStyle">
+        <item name="android:background">@color/dark_icon</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:layout_width">48dp</item>
+        <item name="android:layout_marginStart">16dp</item>
+    </style>
+
+    <style name="CustomTextViewStyle">
+        <item name="android:textAppearance">@style/Body1</item>
+        <item name="android:textColor">?attr/textColor</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginStart">16dp</item>
+        <item name="android:layout_marginTop">16dp</item>
+        <item name="android:layout_marginEnd">16dp</item>
+    </style>
+
+    <style name="CustomCaptionTextStyle">
+        <item name="android:textAppearance">@style/Caption</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginStart">16dp</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b7a9d86..f859169 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,6 +17,23 @@
     <string name="e_mail">E-mail</string>
     <string name="password">Password</string>
     <string name="reset_my_password">Reset my password</string>
+    <string name="items_in_cart">4 items in your cart</string>
+    <string name="image">image</string>
+    <string name="on_the_top">On the top</string>
+    <string name="caption">Caption</string>
+    <string name="us_1_50">$US, 1.50</string>
+    <string name="close">close</string>
+    <string name="us_4_50">$US, 4.50</string>
+    <string name="forever_friends">Forever Friends</string>
+    <string name="us_8_00">$US, 8.00</string>
+    <string name="prototyping_kit">Prototyping Kit</string>
+    <string name="basket_coffee"><![CDATA[Basket & Coffee]]></string>
+    <string name="us_22_00">$US, 22.00</string>
+    <string name="your_order_total">Your order total</string>
+    <string name="_41_24">41.24</string>
+    <string name="subtotal">Subtotal\nShipping\nTax</string>
+    <string name="_36_00_n2_00_n3_50">36.00\n2.00\n3.50</string>
+    <string name="pay_now">Pay now</string>
 
     <string-array name="select_items">
         <item>Item 1</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index cb469eb..e4dd97e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -31,5 +31,11 @@
         <item name="buttonTextColor">@color/light_background</item>
         <item name="dialogButtonColor">@color/light_primary</item>
         <item name="resetButtonColor">@color/light_primary</item>
+        <item name="itemsInCartColor">@color/light_main</item>
+        <item name="cartToolBarColor">@color/light_primary</item>
+        <item name="closeIconColor">@color/light_accent</item>
+        <item name="totalTextColor">@color/light_main</item>
+        <item name="walletIconColor">@color/light_icon</item>
+        <item name="walletButtonColor">@color/light_main</item>
     </style>
 </resources>