From 6166cad35bc2a4404b1ac6e6c590602bc7ffcb89 Mon Sep 17 00:00:00 2001
From: Anv0l <andrei.voloshin@live.com>
Date: Sun, 6 Apr 2025 14:56:18 +0300
Subject: [PATCH 1/4] =?UTF-8?q?=D0=A1=D0=B2=D0=B5=D1=80=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BB=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=83=20Con?=
 =?UTF-8?q?tacts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../viewandresources/ContactsActivity.kt      |   3 +
 app/src/main/res/drawable/arrow_back.xml      |   9 +
 app/src/main/res/drawable/attach_file.xml     |   9 +
 app/src/main/res/drawable/bookmark.xml        |  11 +
 app/src/main/res/drawable/calendar_today.xml  |  10 +
 app/src/main/res/drawable/microphone.xml      |  10 +
 app/src/main/res/drawable/more_vert.xml       |   9 +
 app/src/main/res/drawable/person.xml          |  10 +
 app/src/main/res/drawable/smartphone.xml      |  10 +
 app/src/main/res/layout/activity_contacts.xml | 241 +++++++++++++++++-
 app/src/main/res/values/arrays.xml            |  11 +
 app/src/main/res/values/buttons.xml           |  15 ++
 app/src/main/res/values/colors.xml            |   3 +
 app/src/main/res/values/dimens.xml            |   8 +
 app/src/main/res/values/strings.xml           |  22 +-
 app/src/main/res/values/styles.xml            |  18 ++
 16 files changed, 397 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/arrow_back.xml
 create mode 100644 app/src/main/res/drawable/attach_file.xml
 create mode 100644 app/src/main/res/drawable/bookmark.xml
 create mode 100644 app/src/main/res/drawable/calendar_today.xml
 create mode 100644 app/src/main/res/drawable/microphone.xml
 create mode 100644 app/src/main/res/drawable/more_vert.xml
 create mode 100644 app/src/main/res/drawable/person.xml
 create mode 100644 app/src/main/res/drawable/smartphone.xml
 create mode 100644 app/src/main/res/values/arrays.xml
 create mode 100644 app/src/main/res/values/buttons.xml
 create mode 100644 app/src/main/res/values/dimens.xml
 create mode 100644 app/src/main/res/values/styles.xml

diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/ContactsActivity.kt b/app/src/main/java/otus/gpb/homework/viewandresources/ContactsActivity.kt
index 25f1ffb..968f84d 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/ContactsActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/ContactsActivity.kt
@@ -2,6 +2,9 @@ package otus.gpb.homework.viewandresources
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.ArrayAdapter
+import android.widget.ListView
+import android.widget.Toast
 
 class ContactsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
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..1c25a9a
--- /dev/null
+++ b/app/src/main/res/drawable/arrow_back.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m313,520 l224,224 -57,56 -320,-320 320,-320 57,56 -224,224h487v80L313,520Z"
+      android:fillColor="?attr/colorOnSurface"/>
+</vector>
diff --git a/app/src/main/res/drawable/attach_file.xml b/app/src/main/res/drawable/attach_file.xml
new file mode 100644
index 0000000..0a4bdf3
--- /dev/null
+++ b/app/src/main/res/drawable/attach_file.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M720,630q0,104 -73,177T470,880q-104,0 -177,-73t-73,-177v-370q0,-75 52.5,-127.5T400,80q75,0 127.5,52.5T580,260v350q0,46 -32,78t-78,32q-46,0 -78,-32t-32,-78v-370h80v370q0,13 8.5,21.5T470,640q13,0 21.5,-8.5T500,610v-350q-1,-42 -29.5,-71T400,160q-42,0 -71,29t-29,71v370q-1,71 49,120.5T470,800q70,0 119,-49.5T640,630v-390h80v390Z"
+      android:fillColor="?attr/colorOnSurfaceVariant"/>
+</vector>
diff --git a/app/src/main/res/drawable/bookmark.xml b/app/src/main/res/drawable/bookmark.xml
new file mode 100644
index 0000000..83e3088
--- /dev/null
+++ b/app/src/main/res/drawable/bookmark.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:name="bookmark"
+    android:viewportHeight="960">
+
+  <path
+      android:pathData="M200,840v-640q0,-33 23.5,-56.5T280,120h400q33,0 56.5,23.5T760,200v640L480,720 200,840ZM280,718 L480,632 680,718v-518L280,200v518ZM280,200h400,-400Z"
+      android:fillColor="?attr/colorOnSurfaceVariant"/>
+</vector>
diff --git a/app/src/main/res/drawable/calendar_today.xml b/app/src/main/res/drawable/calendar_today.xml
new file mode 100644
index 0000000..8621344
--- /dev/null
+++ b/app/src/main/res/drawable/calendar_today.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:name="calendar_today"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M360,660q-42,0 -71,-29t-29,-71q0,-42 29,-71t71,-29q42,0 71,29t29,71q0,42 -29,71t-71,29ZM200,880q-33,0 -56.5,-23.5T120,800v-560q0,-33 23.5,-56.5T200,160h40v-80h80v80h320v-80h80v80h40q33,0 56.5,23.5T840,240v560q0,33 -23.5,56.5T760,880L200,880ZM200,800h560v-400L200,400v400ZM200,320h560v-80L200,240v80ZM200,320v-80,80Z"
+      android:fillColor="?attr/colorOnSurfaceVariant"/>
+</vector>
diff --git a/app/src/main/res/drawable/microphone.xml b/app/src/main/res/drawable/microphone.xml
new file mode 100644
index 0000000..73cf67e
--- /dev/null
+++ b/app/src/main/res/drawable/microphone.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:name="microphone"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M480,560q-50,0 -85,-35t-35,-85v-240q0,-50 35,-85t85,-35q50,0 85,35t35,85v240q0,50 -35,85t-85,35ZM480,320ZM440,840v-123q-104,-14 -172,-93t-68,-184h80q0,83 58.5,141.5T480,640q83,0 141.5,-58.5T680,440h80q0,105 -68,184t-172,93v123h-80ZM480,480q17,0 28.5,-11.5T520,440v-240q0,-17 -11.5,-28.5T480,160q-17,0 -28.5,11.5T440,200v240q0,17 11.5,28.5T480,480Z"
+      android:fillColor="?attr/colorOnSurfaceVariant"/>
+</vector>
diff --git a/app/src/main/res/drawable/more_vert.xml b/app/src/main/res/drawable/more_vert.xml
new file mode 100644
index 0000000..287b838
--- /dev/null
+++ b/app/src/main/res/drawable/more_vert.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M480,800q-33,0 -56.5,-23.5T400,720q0,-33 23.5,-56.5T480,640q33,0 56.5,23.5T560,720q0,33 -23.5,56.5T480,800ZM480,560q-33,0 -56.5,-23.5T400,480q0,-33 23.5,-56.5T480,400q33,0 56.5,23.5T560,480q0,33 -23.5,56.5T480,560ZM480,320q-33,0 -56.5,-23.5T400,240q0,-33 23.5,-56.5T480,160q33,0 56.5,23.5T560,240q0,33 -23.5,56.5T480,320Z"
+      android:fillColor="?attr/colorOnSurfaceVariant"/>
+</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..c624472
--- /dev/null
+++ b/app/src/main/res/drawable/person.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:name="person"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M480,480q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM160,800v-112q0,-34 17.5,-62.5T224,582q62,-31 126,-46.5T480,520q66,0 130,15.5T736,582q29,15 46.5,43.5T800,688v112L160,800ZM240,720h480v-32q0,-11 -5.5,-20T700,654q-54,-27 -109,-40.5T480,600q-56,0 -111,13.5T260,654q-9,5 -14.5,14t-5.5,20v32ZM480,400q33,0 56.5,-23.5T560,320q0,-33 -23.5,-56.5T480,240q-33,0 -56.5,23.5T400,320q0,33 23.5,56.5T480,400ZM480,320ZM480,720Z"
+      android:fillColor="?attr/colorOnSurfaceVariant"/>
+</vector>
diff --git a/app/src/main/res/drawable/smartphone.xml b/app/src/main/res/drawable/smartphone.xml
new file mode 100644
index 0000000..250191c
--- /dev/null
+++ b/app/src/main/res/drawable/smartphone.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:name="smartphone"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M280,920q-33,0 -56.5,-23.5T200,840v-720q0,-33 23.5,-56.5T280,40h400q33,0 56.5,23.5T760,120v720q0,33 -23.5,56.5T680,920L280,920ZM280,800v40h400v-40L280,800ZM280,720h400v-480L280,240v480ZM280,160h400v-40L280,120v40ZM280,160v-40,40ZM280,800v40,-40Z"
+      android:fillColor="?attr/colorOnSurfaceVariant"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml
index 6ef087b..374edbb 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -4,6 +4,245 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".ContactsActivity">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <!-- header BEGIN -->
+    <ImageView
+        android:id="@+id/contact_back"
+        style="@style/imageButton.clickable.Border"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/contact_back"
+        android:src="@drawable/arrow_back"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/contact_display_name"
+        style="@style/HeaderTextView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/contact_placeholder_name"
+        app:layout_constraintBottom_toBottomOf="@id/contact_back"
+        app:layout_constraintEnd_toStartOf="@id/contact_options"
+        app:layout_constraintStart_toEndOf="@id/contact_back"
+        app:layout_constraintTop_toTopOf="@id/contact_back" />
+
+    <ImageView
+        android:id="@+id/contact_attach_file"
+        style="@style/imageButton.clickable.Border"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/contact_options"
+        android:src="@drawable/more_vert"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/contact_options"
+        style="@style/imageButton.clickable.Border"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/contact_attach_file"
+        android:src="@drawable/attach_file"
+        app:layout_constraintEnd_toStartOf="@id/contact_attach_file"
+        app:layout_constraintTop_toTopOf="parent" />
+    <!-- header END -->
+
+    <ScrollView
+        android:id="@+id/scroll"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="@dimen/padding_contact_fields_to_header"
+        app:layout_constraintBottom_toTopOf="@id/contact_save"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/contact_back">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!--  name BEGIN  -->
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/contact_name"
+                style="@style/Widget.Material3.TextInputLayout.FilledBox.Padding"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/contact_hint_name"
+                app:endIconDrawable="@drawable/person"
+                app:endIconMode="custom"
+                app:layout_constraintTop_toBottomOf="@id/scroll"
+                tools:ignore="NotSibling">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/contact_placeholder_name" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <!--  name END  -->
+
+            <!--    Phone & Phone type BEGIN-->
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/contact_phone"
+                style="@style/Widget.Material3.TextInputLayout.FilledBox.Padding"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:hint="@string/contact_hint_phone"
+                app:endIconDrawable="@drawable/smartphone"
+                app:endIconMode="custom"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/contact_name"
+                app:layout_constraintWidth_percent="0.60">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/contact_placeholder_phone" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/contact_phone_type"
+                style="@style/Widget.Material3.TextInputLayout.FilledBox.ExposedDropdownMenu.Padding"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:choiceMode="singleChoice"
+                android:hint="@string/contact_hint_phone_type"
+                android:inputType="phone"
+
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintStart_toEndOf="@id/contact_phone"
+                app:layout_constraintTop_toTopOf="@id/contact_phone"
+                app:layout_constraintWidth_percent="0.40">
+
+                <AutoCompleteTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="none"
+                    android:text="@string/contact_placeholder_phone_type"
+                    app:simpleItems="@array/phone_types"
+
+                    tools:ignore="LabelFor" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+            <!--    Phone & Phone type END-->
+
+            <!--    Address BEGIN-->
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/contact_address"
+                style="@style/Widget.Material3.TextInputLayout.FilledBox.Padding"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/contact_hint_address"
+                app:endIconDrawable="@drawable/bookmark"
+                app:endIconMode="custom"
+
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/contact_phone">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/contact_placeholder_address" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <!--    Address END-->
+
+            <!--    City & Country BEGIN-->
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/contact_city"
+                style="@style/Widget.Material3.TextInputLayout.FilledBox.Padding"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:hint="@string/contact_hint_city"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/contact_address"
+                app:layout_constraintWidth_percent="0.50">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/contact_placeholder_city" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/contact_country"
+                style="@style/Widget.Material3.TextInputLayout.FilledBox.Padding"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:hint="@string/contact_hint_country"
+
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintStart_toEndOf="@id/contact_city"
+                app:layout_constraintTop_toTopOf="@id/contact_city"
+                app:layout_constraintWidth_percent="0.50">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/contact_placeholder_country" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+            <!--    City & Country END-->
+
+            <!--    Birthday BEGIN-->
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/contact_birthday"
+                style="@style/Widget.Material3.TextInputLayout.FilledBox.Padding"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/contact_hint_birthday"
+                app:endIconDrawable="@drawable/calendar_today"
+                app:endIconMode="custom"
+
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/contact_city">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/contact_placeholder_date" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <!--    Birthday END-->
+
+            <!--    Note BEGIN-->
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/contact_notes"
+                style="@style/Widget.Material3.TextInputLayout.FilledBox.Padding"
+
+                android:layout_width="match_parent"
+
+                android:layout_height="wrap_content"
+                android:hint="@string/contact_hint_notes"
+                app:endIconDrawable="@drawable/microphone"
+                app:endIconMode="custom"
+
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/contact_birthday">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/contact_placeholder_notes" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <!--    Note END-->
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/contact_save"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/padding_header_text"
+
+        android:text="@string/contact_hint_save"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintVertical_bias="1" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..0a011e4
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="phone_types">
+        <item>Mobile</item>
+        <item>Home</item>
+        <item>Work</item>
+        <item>Cellular</item>
+        <item>Fax</item>
+        <item>Other</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/buttons.xml b/app/src/main/res/values/buttons.xml
new file mode 100644
index 0000000..155f953
--- /dev/null
+++ b/app/src/main/res/values/buttons.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="imageButton">
+        <item name="android:padding">@dimen/padding_header_text</item>
+        <item name="android:layout_margin">@dimen/margin_header_text</item>
+    </style>
+    <style name="imageButton.clickable">
+        <item name="android:clickable">true</item>
+        <item name="android:focusable">true</item>
+    </style>
+
+    <style name="imageButton.clickable.Border">
+        <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..38bc029 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,7 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+    <color name="on_surface_normal">#191C20</color>
+    <color name="on_surface_dark">#E1E2E9</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..04c1e0c
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="padding_header_text">15dp</dimen>
+    <dimen name="padding_contact_fields_to_header">10dp</dimen>
+    <dimen name="padding_contact_fields">5dp</dimen>
+    <dimen name="header_font_size">25sp</dimen>
+    <dimen name="margin_header_text">5dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a7036ac..756c2ef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,23 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">View &amp; Resources</string>
+    <string name="contact_placeholder_name">Text placeholder</string>
+    <string name="contact_back">Contact - back</string>
+    <string name="contact_options">Contact - options</string>
+    <string name="contact_attach_file">contact - attach file</string>
+    <string name="contact_hint_name">Name</string>
+    <string name="contact_hint_phone">Phone</string>
+    <string name="contact_hint_phone_type">Select</string>
+    <string name="contact_hint_save">Save</string>
+    <string name="contact_hint_address">Address</string>
+    <string name="contact_hint_city">City</string>
+    <string name="contact_hint_country">Country</string>
+    <string name="contact_hint_birthday">Date</string>
+    <string name="contact_hint_notes">Notes</string>
+    <string name="contact_placeholder_phone" tools:ignore="TypographyDashes">+1(234)567-8900</string>
+    <string name="contact_placeholder_phone_type">Mobile</string>
+    <string name="contact_placeholder_address">123, Lenin Street, Apt. 6</string>
+    <string name="contact_placeholder_city">Tokyo</string>
+    <string name="contact_placeholder_country">Australia</string>
+    <string name="contact_placeholder_date">Birthday</string>
+    <string name="contact_placeholder_notes">Loves burgers and french fries</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..f633ead
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="HeaderTextView">
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:padding">@dimen/padding_header_text</item>
+        <item name="android:textSize">@dimen/header_font_size</item>
+    </style>
+
+    <style name="Widget.Material3.TextInputLayout.FilledBox.Padding">
+        <item name="android:padding">5dp</item>
+    </style>
+
+    <style name="Widget.Material3.TextInputLayout.FilledBox.ExposedDropdownMenu.Padding">
+        <item name="android:padding">5dp</item>
+    </style>
+
+</resources>

From 7e1a0f53b7b0eea7e29e0a3bb74e4034d588979c Mon Sep 17 00:00:00 2001
From: Anv0l <andrei.voloshin@live.com>
Date: Sun, 13 Apr 2025 16:55:16 +0300
Subject: [PATCH 2/4] =?UTF-8?q?=D0=A1=D0=B2=D0=B5=D1=80=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D1=88=D0=B8=D0=B5=D1=81?=
 =?UTF-8?q?=D1=8F=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=B8=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Корзина
* Элемент корзины (для RecycleView)
* Диалог логина
---
 app/build.gradle                              |   3 +-
 .../homework/viewandresources/CartActivity.kt |  99 ++++++++-
 .../homework/viewandresources/MainActivity.kt |   2 +-
 app/src/main/res/drawable/banana.jpg          | Bin 0 -> 2044 bytes
 app/src/main/res/drawable/bread.jpg           | Bin 0 -> 7305 bytes
 app/src/main/res/drawable/butter.jpg          | Bin 0 -> 4126 bytes
 app/src/main/res/drawable/cancel.xml          |   9 +
 app/src/main/res/drawable/eggs.jpg            | Bin 0 -> 2202 bytes
 app/src/main/res/drawable/light_mode.xml      |   9 +
 app/src/main/res/drawable/mood.xml            |   9 +
 app/src/main/res/drawable/salt.jpg            | Bin 0 -> 3299 bytes
 app/src/main/res/drawable/sausage.jpg         | Bin 0 -> 3652 bytes
 .../main/res/layout-land/activity_cart.xml    | 190 ++++++++++++++++++
 app/src/main/res/layout/activity_cart.xml     | 175 +++++++++++++++-
 app/src/main/res/layout/activity_contacts.xml |  80 ++++----
 app/src/main/res/layout/cart_item.xml         |  66 ++++++
 app/src/main/res/layout/dialog_signin.xml     |  84 +++++++-
 app/src/main/res/menu/cart_toolbar_menu.xml   |   8 +
 .../main/res/menu/contact_toolbar_menu.xml    |  13 ++
 app/src/main/res/values-night/themes.xml      |   6 +
 app/src/main/res/values/attrs.xml             |   9 +
 app/src/main/res/values/buttons.xml           |  15 --
 app/src/main/res/values/colors.xml            |  20 ++
 app/src/main/res/values/dimens.xml            |   5 +
 app/src/main/res/values/strings.xml           |  29 +++
 app/src/main/res/values/styles.xml            |  36 ++++
 app/src/main/res/values/themes.xml            |   7 +
 27 files changed, 808 insertions(+), 66 deletions(-)
 create mode 100644 app/src/main/res/drawable/banana.jpg
 create mode 100644 app/src/main/res/drawable/bread.jpg
 create mode 100644 app/src/main/res/drawable/butter.jpg
 create mode 100644 app/src/main/res/drawable/cancel.xml
 create mode 100644 app/src/main/res/drawable/eggs.jpg
 create mode 100644 app/src/main/res/drawable/light_mode.xml
 create mode 100644 app/src/main/res/drawable/mood.xml
 create mode 100644 app/src/main/res/drawable/salt.jpg
 create mode 100644 app/src/main/res/drawable/sausage.jpg
 create mode 100644 app/src/main/res/layout-land/activity_cart.xml
 create mode 100644 app/src/main/res/layout/cart_item.xml
 create mode 100644 app/src/main/res/menu/cart_toolbar_menu.xml
 create mode 100644 app/src/main/res/menu/contact_toolbar_menu.xml
 create mode 100644 app/src/main/res/values/attrs.xml
 delete mode 100644 app/src/main/res/values/buttons.xml

diff --git a/app/build.gradle b/app/build.gradle
index debcfaf..5835561 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,5 +35,6 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.15.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt b/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
index b6cbf73..6aebeb1 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
@@ -1,11 +1,108 @@
 package otus.gpb.homework.viewandresources
 
+import android.media.Image
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import org.w3c.dom.Text
 
 class CartActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_cart)
+
+        class CartItem(
+            var image: Int,
+            var name: String,
+            var category: String,
+            var extra: String,
+            var price: Double = 0.0
+        )
+
+        fun formatPrice(price: Double): String {
+            return "%.2f".format(price)
+        }
+        class MyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+            val itemName: TextView = itemView.findViewById(R.id.cart_item_name)
+            val itemCategory: TextView = itemView.findViewById(R.id.cart_item_category)
+            val itemExtra: TextView = itemView.findViewById(R.id.cart_item_extra)
+            val itemPrice: TextView = itemView.findViewById(R.id.cart_item_price)
+            val itemImage: ImageView = itemView.findViewById(R.id.cart_item_image)
+        }
+
+        class MyAdapter(private val data: List<CartItem>) :
+            RecyclerView.Adapter<MyViewHolder>() {
+            override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder {
+                val view = LayoutInflater.from(parent.context)
+                    .inflate(R.layout.cart_item, parent, false)
+                return MyViewHolder(view)
+            }
+
+            override fun getItemCount(): Int {
+                return data.size
+            }
+
+            override fun onBindViewHolder(holder: MyViewHolder, position: Int) {
+                holder.itemName.width = holder.itemName.measuredWidth
+                holder.itemName.isSelected = true
+                with(data[position]) {
+                    holder.itemName.text = name
+                    holder.itemPrice.text = formatPrice(price)
+                    holder.itemCategory.text = category
+                    holder.itemExtra.text = extra
+
+                    holder.itemImage.setImageResource(image)
+                }
+
+            }
+
+            override fun onViewAttachedToWindow(holder: MyViewHolder) {
+                holder.itemName.isSelected = true
+            }
+
+            override fun onViewDetachedFromWindow(holder: MyViewHolder) {
+                holder.itemName.isSelected = false
+            }
+
+        }
+
+
+
+        val recyclerView = findViewById<RecyclerView>(R.id.item_list)
+
+        val data: List<CartItem> = listOf(
+            CartItem(R.drawable.eggs, "Куриные яйца", "Продукты", "Сорт С2", 12.0),
+            CartItem(R.drawable.banana, "Бананы", "Продукты", "Ямайка", 2.0),
+            CartItem(R.drawable.salt, "Соль пищевая", "Продукты", "Без ГМО", 1.0),
+            CartItem(R.drawable.butter, "Сливочное масло", "Продукты", "72.5% жирности", 2.55),
+            CartItem(R.drawable.bread, "Хлеб ржаной", "Продукты", "Собвестнного производства", 1.99),
+            CartItem(R.drawable.sausage, "Сосиски молочные", "Продукты", "Без молока и мяса", 4.0)
+        )
+
+        recyclerView.layoutManager = LinearLayoutManager(this)
+        recyclerView.adapter = MyAdapter(data)
+
+        findViewById<TextView>(R.id.cart_items_count).text = resources.getQuantityString(R.plurals.cart_items_count, data.count(), data.count())
+
+        var subtotal = 0.0
+        data.forEach { item ->
+            subtotal += item.price
+        }
+        findViewById<TextView>(R.id.cart_subtotal_value).text = formatPrice(subtotal)
+        val shipping = 25.0
+        findViewById<TextView>(R.id.cart_shipping_value).text = formatPrice(shipping)
+        val tax = 0.2
+        val taxAmount = subtotal * tax
+        findViewById<TextView>(R.id.cart_tax_value).text = formatPrice(taxAmount)
+        val orderTotal = subtotal + taxAmount + shipping
+        findViewById<TextView>(R.id.cart_order_total_value).text = formatPrice(orderTotal)
     }
-}
\ No newline at end of file
+}
+
diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/MainActivity.kt b/app/src/main/java/otus/gpb/homework/viewandresources/MainActivity.kt
index 22b779c..0c76ae7 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/MainActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/MainActivity.kt
@@ -19,7 +19,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         findViewById<Button>(R.id.signin_button).setOnClickListener {
-            MaterialAlertDialogBuilder(this)
+            MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialog_Material3_Login)
                 .setView(R.layout.dialog_signin)
                 .show()
         }
diff --git a/app/src/main/res/drawable/banana.jpg b/app/src/main/res/drawable/banana.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d46fb1dacef7063c2db5c25a72b45bbbf5c3f947
GIT binary patch
literal 2044
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
LEe_7ja;N_Q&riE=

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/bread.jpg b/app/src/main/res/drawable/bread.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b7855c1b056d6607c2806bc2b243a0b6dcec1d5b
GIT binary patch
literal 7305
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/butter.jpg b/app/src/main/res/drawable/butter.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2f2773ec1e3e2e7daa8478a608c64a9a3df94878
GIT binary patch
literal 4126
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
P6F}a$B1+1C#GLvM80O}>

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/cancel.xml b/app/src/main/res/drawable/cancel.xml
new file mode 100644
index 0000000..2a71bc4
--- /dev/null
+++ b/app/src/main/res/drawable/cancel.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m336,680 l144,-144 144,144 56,-56 -144,-144 144,-144 -56,-56 -144,144 -144,-144 -56,56 144,144 -144,144 56,56ZM480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-83 31.5,-156T197,197q54,-54 127,-85.5T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,83 -31.5,156T763,763q-54,54 -127,85.5T480,880ZM480,800q134,0 227,-93t93,-227q0,-134 -93,-227t-227,-93q-134,0 -227,93t-93,227q0,134 93,227t227,93ZM480,480Z"
+      android:fillColor="?attr/colorOnSurfaceVariant"/>
+</vector>
diff --git a/app/src/main/res/drawable/eggs.jpg b/app/src/main/res/drawable/eggs.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..735958462436ef399da0a976c63bf78a65d619e6
GIT binary patch
literal 2202
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
DQ33ih

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/light_mode.xml b/app/src/main/res/drawable/light_mode.xml
new file mode 100644
index 0000000..11dca2e
--- /dev/null
+++ b/app/src/main/res/drawable/light_mode.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M480,600q50,0 85,-35t35,-85q0,-50 -35,-85t-85,-35q-50,0 -85,35t-35,85q0,50 35,85t85,35ZM480,680q-83,0 -141.5,-58.5T280,480q0,-83 58.5,-141.5T480,280q83,0 141.5,58.5T680,480q0,83 -58.5,141.5T480,680ZM200,520L40,520v-80h160v80ZM920,520L760,520v-80h160v80ZM440,200v-160h80v160h-80ZM440,920v-160h80v160h-80ZM256,310l-101,-97 57,-59 96,100 -52,56ZM748,806 L651,705 704,650 805,747 748,806ZM650,256 L747,155 806,212 706,308 650,256ZM154,748l101,-97 55,53 -97,101 -59,-57ZM480,480Z"
+      android:fillColor="?attr/colorOnSurfaceVariant"/>
+</vector>
diff --git a/app/src/main/res/drawable/mood.xml b/app/src/main/res/drawable/mood.xml
new file mode 100644
index 0000000..f1c8406
--- /dev/null
+++ b/app/src/main/res/drawable/mood.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M620,440q25,0 42.5,-17.5T680,380q0,-25 -17.5,-42.5T620,320q-25,0 -42.5,17.5T560,380q0,25 17.5,42.5T620,440ZM340,440q25,0 42.5,-17.5T400,380q0,-25 -17.5,-42.5T340,320q-25,0 -42.5,17.5T280,380q0,25 17.5,42.5T340,440ZM480,700q68,0 123.5,-38.5T684,560L276,560q25,63 80.5,101.5T480,700ZM480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-83 31.5,-156T197,197q54,-54 127,-85.5T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,83 -31.5,156T763,763q-54,54 -127,85.5T480,880ZM480,480ZM480,800q134,0 227,-93t93,-227q0,-134 -93,-227t-227,-93q-134,0 -227,93t-93,227q0,134 93,227t227,93Z"
+      android:fillColor="?attr/colorOnSurfaceVariant"/>
+</vector>
diff --git a/app/src/main/res/drawable/salt.jpg b/app/src/main/res/drawable/salt.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b90c782130a20670d06daa48ba0e6ee59d76945e
GIT binary patch
literal 3299
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/sausage.jpg b/app/src/main/res/drawable/sausage.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..13ecec8b6cc85116b374c8563e52ef0279e9dc61
GIT binary patch
literal 3652
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout-land/activity_cart.xml b/app/src/main/res/layout-land/activity_cart.xml
new file mode 100644
index 0000000..f4f6ce9
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_cart.xml
@@ -0,0 +1,190 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".CartActivity">
+
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/cart_app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/cart_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                app:menu="@menu/cart_toolbar_menu"
+                app:navigationIcon="@drawable/arrow_back"
+                app:title="@string/cart_title">
+
+                <androidx.appcompat.widget.ActionMenuView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="end">
+
+                </androidx.appcompat.widget.ActionMenuView>
+
+            </com.google.android.material.appbar.MaterialToolbar>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <TextView
+        android:id="@+id/cart_items_count"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/cart_title"
+        app:layout_constraintTop_toBottomOf="@id/cart_app_bar" />
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/cart_items_count">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/item_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/padding_contact_fields_to_header"
+                app:layout_constraintBottom_toTopOf="@id/cart_footer"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/cart_items_count">
+
+
+            </androidx.recyclerview.widget.RecyclerView>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cart_footer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent">
+
+                <TextView
+                    android:id="@+id/cart_order_total"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:text="Order Total:"
+                    app:layout_constraintBottom_toTopOf="@id/cart_subtotal"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintWidth_percent="0.50" />
+
+                <TextView
+                    android:id="@+id/cart_order_total_value"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:text="175.50"
+                    android:textAlignment="textEnd"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/cart_order_total"
+                    app:layout_constraintTop_toTopOf="@id/cart_order_total"
+                    app:layout_constraintWidth_percent="0.50" />
+
+                <TextView
+                    android:id="@+id/cart_subtotal"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:text="Subtotal:"
+                    app:layout_constraintBottom_toTopOf="@id/cart_shipping"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintWidth_percent="0.50" />
+
+                <TextView
+                    android:id="@+id/cart_subtotal_value"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:text="$140"
+                    android:textAlignment="textEnd"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/cart_subtotal"
+                    app:layout_constraintTop_toTopOf="@id/cart_subtotal"
+                    app:layout_constraintWidth_percent="0.50" />
+
+                <TextView
+                    android:id="@+id/cart_shipping"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:text="Shipping:"
+                    app:layout_constraintBottom_toTopOf="@id/cart_tax"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintWidth_percent="0.50" />
+
+                <TextView
+                    android:id="@+id/cart_shipping_value"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:text="$25"
+                    android:textAlignment="textEnd"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/cart_shipping"
+                    app:layout_constraintTop_toTopOf="@id/cart_shipping"
+                    app:layout_constraintWidth_percent="0.50" />
+
+                <TextView
+                    android:id="@+id/cart_tax"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:text="Tax:"
+                    app:layout_constraintBottom_toTopOf="@id/cart_place_order"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintWidth_percent="0.50" />
+
+                <TextView
+                    android:id="@+id/cart_tax_value"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:text="$10.50"
+                    android:textAlignment="textEnd"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/cart_tax"
+                    app:layout_constraintTop_toTopOf="@id/cart_tax"
+                    app:layout_constraintWidth_percent="0.50" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/cart_place_order"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/padding_header_text"
+
+                    android:text="Place order"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintVertical_bias="1" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml
index 57dc4d4..7eec98b 100644
--- a/app/src/main/res/layout/activity_cart.xml
+++ b/app/src/main/res/layout/activity_cart.xml
@@ -4,6 +4,179 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".CartActivity">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/cart_app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/cart_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                app:menu="@menu/cart_toolbar_menu"
+                app:navigationIcon="@drawable/arrow_back"
+                app:title="@string/cart_title">
+
+                <androidx.appcompat.widget.ActionMenuView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="end">
+
+                </androidx.appcompat.widget.ActionMenuView>
+
+            </com.google.android.material.appbar.MaterialToolbar>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <TextView
+        android:id="@+id/cart_items_count"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/cart_title"
+        app:layout_constraintTop_toBottomOf="@id/cart_app_bar" />
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/item_list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="@dimen/padding_contact_fields_to_header"
+        app:layout_constraintBottom_toTopOf="@id/cart_footer"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/cart_items_count">
+
+
+    </androidx.recyclerview.widget.RecyclerView>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cart_footer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <TextView
+            android:id="@+id/cart_order_total"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:textSize="@dimen/cart_order_total_size"
+            android:text="@string/cart_order_total"
+            app:layout_constraintBottom_toTopOf="@id/cart_subtotal"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintWidth_percent="0.50" />
+
+        <TextView
+            android:id="@+id/cart_order_total_value"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:textSize="@dimen/cart_order_total_size"
+            android:text="@string/cart_oder_total_value"
+            android:textAlignment="textEnd"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toEndOf="@id/cart_order_total"
+            app:layout_constraintTop_toTopOf="@id/cart_order_total"
+            app:layout_constraintWidth_percent="0.50" />
+
+        <TextView
+            android:id="@+id/cart_subtotal"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:text="@string/cart_subtotal"
+            app:layout_constraintBottom_toTopOf="@id/cart_shipping"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintWidth_percent="0.50" />
+
+        <TextView
+            android:id="@+id/cart_subtotal_value"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:text="@string/cart_subtotal_value"
+            android:textAlignment="textEnd"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toEndOf="@id/cart_subtotal"
+            app:layout_constraintTop_toTopOf="@id/cart_subtotal"
+            app:layout_constraintWidth_percent="0.50" />
+
+        <TextView
+            android:id="@+id/cart_shipping"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:text="@string/cart_shipping"
+            app:layout_constraintBottom_toTopOf="@id/cart_tax"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintWidth_percent="0.50" />
+
+        <TextView
+            android:id="@+id/cart_shipping_value"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:text="@string/cart_shipping_value"
+            android:textAlignment="textEnd"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toEndOf="@id/cart_shipping"
+            app:layout_constraintTop_toTopOf="@id/cart_shipping"
+            app:layout_constraintWidth_percent="0.50" />
+
+        <TextView
+            android:id="@+id/cart_tax"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:text="@string/cart_tax"
+            app:layout_constraintBottom_toTopOf="@id/cart_place_order"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintWidth_percent="0.50" />
+
+        <TextView
+            android:id="@+id/cart_tax_value"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:text="@string/cart_tax_value"
+            android:textAlignment="textEnd"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toEndOf="@id/cart_tax"
+            app:layout_constraintTop_toTopOf="@id/cart_tax"
+            app:layout_constraintWidth_percent="0.50" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/cart_place_order"
+            style="@style/Widget.Material3.Button.Main"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Place order"
+            app:flow_horizontalAlign="center"
+            app:icon="@drawable/mood"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</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 374edbb..c222952 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -7,58 +7,48 @@
     android:fitsSystemWindows="true"
     tools:context=".ContactsActivity">
 
-    <!-- header BEGIN -->
-    <ImageView
-        android:id="@+id/contact_back"
-        style="@style/imageButton.clickable.Border"
-        android:layout_width="wrap_content"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/contact_app_bar"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:contentDescription="@string/contact_back"
-        android:src="@drawable/arrow_back"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-        android:id="@+id/contact_display_name"
-        style="@style/HeaderTextView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/contact_placeholder_name"
-        app:layout_constraintBottom_toBottomOf="@id/contact_back"
-        app:layout_constraintEnd_toStartOf="@id/contact_options"
-        app:layout_constraintStart_toEndOf="@id/contact_back"
-        app:layout_constraintTop_toTopOf="@id/contact_back" />
-
-    <ImageView
-        android:id="@+id/contact_attach_file"
-        style="@style/imageButton.clickable.Border"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/contact_options"
-        android:src="@drawable/more_vert"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <ImageView
-        android:id="@+id/contact_options"
-        style="@style/imageButton.clickable.Border"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/contact_attach_file"
-        android:src="@drawable/attach_file"
-        app:layout_constraintEnd_toStartOf="@id/contact_attach_file"
-        app:layout_constraintTop_toTopOf="parent" />
-    <!-- header END -->
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/contact_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                app:menu="@menu/contact_toolbar_menu"
+                app:navigationIcon="@drawable/arrow_back"
+                app:title="@string/contact_placeholder_name">
+
+                <androidx.appcompat.widget.ActionMenuView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="end">
+
+                </androidx.appcompat.widget.ActionMenuView>
+
+            </com.google.android.material.appbar.MaterialToolbar>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <ScrollView
         android:id="@+id/scroll"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:paddingTop="@dimen/padding_contact_fields_to_header"
-        app:layout_constraintBottom_toTopOf="@id/contact_save"
+        app:layout_constraintBottom_toTopOf="@id/cart_place_order"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/contact_back">
+        app:layout_constraintTop_toBottomOf="@id/contact_app_bar">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -167,7 +157,6 @@
                     android:text="@string/contact_placeholder_city" />
             </com.google.android.material.textfield.TextInputLayout>
 
-
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/contact_country"
                 style="@style/Widget.Material3.TextInputLayout.FilledBox.Padding"
@@ -234,15 +223,14 @@
     </ScrollView>
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/contact_save"
+        android:id="@+id/cart_place_order"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_header_text"
-
+        style="@style/Widget.Material3.Button.Main"
+        android:layout_margin="5dp"
         android:text="@string/contact_hint_save"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintVertical_bias="1" />
+        app:layout_constraintStart_toStartOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/cart_item.xml b/app/src/main/res/layout/cart_item.xml
new file mode 100644
index 0000000..010dc5a
--- /dev/null
+++ b/app/src/main/res/layout/cart_item.xml
@@ -0,0 +1,66 @@
+<?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:focusable="true"
+    android:focusableInTouchMode="true"
+    android:padding="16dp">
+
+    <ImageView
+        android:id="@+id/cart_item_image"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:contentDescription="@string/cart_item_desc_image"
+        android:src="@mipmap/ic_launcher"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/cart_item_name"
+        style="@style/Widget.AppCompat.TextView.Scrollable"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/cart_item_padding"
+        android:paddingEnd="@dimen/cart_item_padding"
+        android:text="@string/cart_item_placeholder_item_name"
+        android:textSize="@dimen/cart_item_name_size"
+        app:layout_constraintEnd_toStartOf="@id/cart_item_price"
+        app:layout_constraintStart_toEndOf="@id/cart_item_image"
+        app:layout_constraintTop_toTopOf="@id/cart_item_image" />
+
+    <TextView
+        android:id="@+id/cart_item_category"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:lines="1"
+        android:paddingStart="@dimen/cart_item_padding"
+        android:text="@string/cart_item_placeholder_category"
+        app:layout_constraintEnd_toStartOf="@id/cart_item_price"
+        app:layout_constraintStart_toEndOf="@id/cart_item_image"
+        app:layout_constraintTop_toBottomOf="@id/cart_item_name" />
+
+    <TextView
+        android:id="@+id/cart_item_extra"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:lines="1"
+        android:paddingStart="@dimen/cart_item_padding"
+        android:text="@string/cart_item_placeholder_extra"
+        app:layout_constraintEnd_toStartOf="@id/cart_item_price"
+        app:layout_constraintStart_toEndOf="@id/cart_item_image"
+        app:layout_constraintTop_toBottomOf="@id/cart_item_category" />
+
+    <TextView
+        android:id="@+id/cart_item_price"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cart_item_placeholder_price"
+        android:textSize="28sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_signin.xml b/app/src/main/res/layout/dialog_signin.xml
index 77d9ef6..ecec1ac 100644
--- a/app/src/main/res/layout/dialog_signin.xml
+++ b/app/src/main/res/layout/dialog_signin.xml
@@ -1,6 +1,88 @@
 <?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="match_parent"
+    android:padding="10dp">
+
+    <TextView
+        android:id="@+id/signin_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/padding_header_text"
+        android:text="@string/login_header"
+        android:textAlignment="center"
+        android:textSize="@dimen/header_font_size"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/signin_login"
+        style="@style/Widget.Material3.TextInputLayout.FilledBox.Padding"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/login_hint_login"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/signin_header">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/login_placeholder_login" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/signin_password"
+        style="@style/Widget.Material3.TextInputLayout.FilledBox.Padding"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/signin_hint_password"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/signin_login"
+        app:passwordToggleDrawable="@drawable/light_mode"
+        app:passwordToggleEnabled="true">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fontFamily="monospace"
+            android:inputType="textPassword"
+            android:text="@string/signin_placeholder_password" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <TextView
+        android:id="@+id/signin_reset"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/login_margin_buttons_top"
+        android:clickable="true"
+        android:focusable="true"
+        android:text="@string/login_reset_password"
+        android:textColor="?attr/colorSysPrimary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/signin_password" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_signin_cancel"
+        style="@style/Widget.Material3.Button.Sighin.Cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/login_margin_buttons_top"
+        android:text="@string/signin_button_cancel"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/signin_reset" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_signin_login"
+        style="@style/Widget.Material3.Button.Sighin.Login"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/login_margin_buttons_top"
+        android:layout_marginEnd="@dimen/login_margin_buttons_end"
+        android:text="@string/signin_button_login"
+        app:layout_constraintEnd_toStartOf="@id/btn_signin_cancel"
+        app:layout_constraintTop_toBottomOf="@id/signin_reset" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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..6194c89
--- /dev/null
+++ b/app/src/main/res/menu/cart_toolbar_menu.xml
@@ -0,0 +1,8 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/cart_cancel"
+        android:icon="@drawable/cancel"
+        android:title="@string/cart_cancel"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/contact_toolbar_menu.xml b/app/src/main/res/menu/contact_toolbar_menu.xml
new file mode 100644
index 0000000..06b2bea
--- /dev/null
+++ b/app/src/main/res/menu/contact_toolbar_menu.xml
@@ -0,0 +1,13 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/contact_attach_file"
+        android:icon="@drawable/attach_file"
+        android:title="@string/contact_attach_file"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/contact_options"
+        android:icon="@drawable/more_vert"
+        android:title="@string/contact_options"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index b236109..561b01e 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -3,5 +3,11 @@
     <style name="Base.Theme.ViewResources" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your dark theme here. -->
         <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
+        <item name="colorSysPrimary">@color/primary_dark</item>
+        <item name="surfaceContainerHigh">@color/surface_container_high_dark</item>
+        <item name="surfaceContainerHighest">@color/surface_container_highest_dark</item>
+        <item name="outline">@color/outline_dark</item>
+        <item name="secondary">@color/secondary_dark</item>
+        <item name="sysOnPrimary">@color/on_primary_dark</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..d3a80b2
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="colorSysPrimary" format="color"/>
+    <attr name="surfaceContainerHigh" format="color"/>
+    <attr name="surfaceContainerHighest" format="color"/>
+    <attr name="outline" format="color"/>
+    <attr name="secondary" format="color"/>
+    <attr name="sysOnPrimary" format="color"/>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/buttons.xml b/app/src/main/res/values/buttons.xml
deleted file mode 100644
index 155f953..0000000
--- a/app/src/main/res/values/buttons.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="imageButton">
-        <item name="android:padding">@dimen/padding_header_text</item>
-        <item name="android:layout_margin">@dimen/margin_header_text</item>
-    </style>
-    <style name="imageButton.clickable">
-        <item name="android:clickable">true</item>
-        <item name="android:focusable">true</item>
-    </style>
-
-    <style name="imageButton.clickable.Border">
-        <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 38bc029..402bb1d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,4 +10,24 @@
 
     <color name="on_surface_normal">#191C20</color>
     <color name="on_surface_dark">#E1E2E9</color>
+
+
+    <color name="primary_light">#3E5F90</color>
+    <color name="primary_dark">#A7C8FF</color>
+
+    <color name="on_primary_light">#FFFFFF</color>
+    <color name="on_primary_dark">#04305F</color>
+
+    <color name="surface_container_high_light">#E7E8EE</color>
+    <color name="surface_container_high_dark">#282A2F</color>
+    
+    <color name="surface_container_highest_light">#E1E2E9</color>
+    <color name="surface_container_highest_dark">#33353A</color>
+
+    <color name="outline_light">#74777F</color>
+    <color name="outline_dark">#8E9199</color>
+
+    <color name="secondary_light">#555F71</color>
+    <color name="secondary_dark">#BDC7DC</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 04c1e0c..59ca898 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,4 +5,9 @@
     <dimen name="padding_contact_fields">5dp</dimen>
     <dimen name="header_font_size">25sp</dimen>
     <dimen name="margin_header_text">5dp</dimen>
+    <dimen name="login_margin_buttons_top">15dp</dimen>
+    <dimen name="login_margin_buttons_end">12dp</dimen>
+    <dimen name="cart_item_padding">10dp</dimen>
+    <dimen name="cart_item_name_size">28sp</dimen>
+    <dimen name="cart_order_total_size">25sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 756c2ef..c0a6590 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,4 +20,33 @@
     <string name="contact_placeholder_country">Australia</string>
     <string name="contact_placeholder_date">Birthday</string>
     <string name="contact_placeholder_notes">Loves burgers and french fries</string>
+    <string name="cart_cancel">Отмена</string>
+    <string name="cart_title">Cart</string>
+    <string name="cart_placeholder_items_count">4 items in your cart</string>
+    <string name="login_header">Login</string>
+    <string name="login_hint_login">Login</string>
+    <string name="login_placeholder_login">ivanpetrov</string>
+    <string name="login_reset_password"><u>Reset my password</u></string>
+    <string name="signin_button_cancel">Cancel</string>
+    <string name="cart_item_desc_image">Item image</string>
+    <string name="cart_item_placeholder_item_name">List Item 1</string>
+    <string name="cart_item_placeholder_category">Category</string>
+    <string name="cart_item_placeholder_extra">Supporting text Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</string>
+    <string name="cart_item_placeholder_price">$35</string>
+    <string name="signin_hint_password">Password</string>
+    <string name="signin_placeholder_password">password322</string>
+    <string name="signin_button_login">Login</string>
+    <string name="cart_order_total">Order Total:</string>
+    <string name="cart_oder_total_value">175.50</string>
+    <string name="cart_subtotal">Subtotal:</string>
+    <string name="cart_subtotal_value">$140</string>
+    <string name="cart_shipping">Shipping:</string>
+    <string name="cart_shipping_value">$25</string>
+    <string name="cart_tax">Tax:</string>
+    <string name="cart_tax_value">$10.50</string>
+
+    <plurals name="cart_items_count">
+        <item quantity="one">%1$d item in your cart</item>
+        <item quantity="other">%1$d items in your cart</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f633ead..b49d350 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="HeaderTextView">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
@@ -9,10 +10,45 @@
 
     <style name="Widget.Material3.TextInputLayout.FilledBox.Padding">
         <item name="android:padding">5dp</item>
+        <item name="boxBackgroundColor">?attr/surfaceContainerHighest</item>
     </style>
 
     <style name="Widget.Material3.TextInputLayout.FilledBox.ExposedDropdownMenu.Padding">
         <item name="android:padding">5dp</item>
     </style>
 
+    <style name="Widget.AppCompat.TextView.Scrollable">
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:marqueeRepeatLimit">marquee_forever</item>
+        <item name="android:focusable">true</item>
+        <item name="android:focusableInTouchMode">true</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:freezesText">true</item>
+        <item name="android:importantForAccessibility">no</item>
+    </style>
+
+    <style name="Widget.Material3.Button.Main">
+        <item name="backgroundTint">?attr/colorSysPrimary</item>
+        <item name="android:textColor">?attr/sysOnPrimary</item>
+    </style>
+
+    <style name="MaterialAlertDialog.Material3.Login">
+        <item name="android:background">?attr/surfaceContainerHigh</item>
+    </style>
+
+    <style name="Widget.Material3.Button.Sighin">
+        <item name="backgroundTint">?attr/surfaceContainerHigh</item>
+        <item name="strokeColor">?attr/outline</item>
+        <item name="strokeWidth">1dp</item>
+    </style>
+
+    <style name="Widget.Material3.Button.Sighin.Login">
+        <item name="android:textColor">?attr/colorSysPrimary</item>
+    </style>
+
+    <style name="Widget.Material3.Button.Sighin.Cancel">
+        <item name="android:textColor">?attr/secondary</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 62ec3ea..153bb23 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,7 +3,14 @@
     <style name="Base.Theme.ViewResources" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
+        <item name="colorSysPrimary">@color/primary_light</item>
+        <item name="surfaceContainerHigh">@color/surface_container_high_light</item>
+        <item name="surfaceContainerHighest">@color/surface_container_highest_light</item>
+        <item name="outline">@color/outline_light</item>
+        <item name="secondary">@color/secondary_light</item>
+        <item name="sysOnPrimary">@color/on_primary_light</item>
     </style>
 
+
     <style name="Theme.ViewResources" parent="Base.Theme.ViewResources" />
 </resources>
\ No newline at end of file

From dc312270f44830a83ad3bc4e356bb19977285b6a Mon Sep 17 00:00:00 2001
From: Anv0l <andrei.voloshin@live.com>
Date: Sun, 13 Apr 2025 17:03:50 +0300
Subject: [PATCH 3/4] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  2 +-
 .../homework/viewandresources/CartActivity.kt |  5 +--
 .../main/res/layout-land/activity_cart.xml    | 34 +++++++++----------
 app/src/main/res/layout/activity_cart.xml     | 20 +++++------
 app/src/main/res/values/dimens.xml            |  1 +
 app/src/main/res/values/strings.xml           |  3 +-
 6 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5835561..2b6af89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.15.0'
+    implementation 'androidx.core:core-ktx:1.16.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt b/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
index 6aebeb1..4d9703f 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
@@ -1,17 +1,14 @@
 package otus.gpb.homework.viewandresources
 
-import android.media.Image
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import org.w3c.dom.Text
 
 class CartActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout-land/activity_cart.xml b/app/src/main/res/layout-land/activity_cart.xml
index f4f6ce9..3c0b289 100644
--- a/app/src/main/res/layout-land/activity_cart.xml
+++ b/app/src/main/res/layout-land/activity_cart.xml
@@ -83,8 +83,8 @@
                     android:id="@+id/cart_order_total"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:text="Order Total:"
+                    android:padding="@dimen/cart_footer_padding"
+                    android:text="@string/cart_order_total"
                     app:layout_constraintBottom_toTopOf="@id/cart_subtotal"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintWidth_percent="0.50" />
@@ -93,8 +93,8 @@
                     android:id="@+id/cart_order_total_value"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:text="175.50"
+                    android:padding="@dimen/cart_footer_padding"
+                    android:text="@string/cart_order_total_value"
                     android:textAlignment="textEnd"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -106,8 +106,8 @@
                     android:id="@+id/cart_subtotal"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:text="Subtotal:"
+                    android:padding="@dimen/cart_footer_padding"
+                    android:text="@string/cart_subtotal"
                     app:layout_constraintBottom_toTopOf="@id/cart_shipping"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintWidth_percent="0.50" />
@@ -116,8 +116,8 @@
                     android:id="@+id/cart_subtotal_value"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:text="$140"
+                    android:padding="@dimen/cart_footer_padding"
+                    android:text="@string/cart_subtotal_value"
                     android:textAlignment="textEnd"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -129,8 +129,8 @@
                     android:id="@+id/cart_shipping"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:text="Shipping:"
+                    android:padding="@dimen/cart_footer_padding"
+                    android:text="@string/cart_shipping"
                     app:layout_constraintBottom_toTopOf="@id/cart_tax"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintWidth_percent="0.50" />
@@ -139,8 +139,8 @@
                     android:id="@+id/cart_shipping_value"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:text="$25"
+                    android:padding="@dimen/cart_footer_padding"
+                    android:text="@string/cart_shipping_value"
                     android:textAlignment="textEnd"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -152,8 +152,8 @@
                     android:id="@+id/cart_tax"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:text="Tax:"
+                    android:padding="@dimen/cart_footer_padding"
+                    android:text="@string/cart_tax"
                     app:layout_constraintBottom_toTopOf="@id/cart_place_order"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintWidth_percent="0.50" />
@@ -162,8 +162,8 @@
                     android:id="@+id/cart_tax_value"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:text="$10.50"
+                    android:padding="@dimen/cart_footer_padding"
+                    android:text="@string/cart_tax_value"
                     android:textAlignment="textEnd"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -177,7 +177,7 @@
                     android:layout_height="wrap_content"
                     android:padding="@dimen/padding_header_text"
 
-                    android:text="Place order"
+                    android:text="@string/cart_place_order"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintVertical_bias="1" />
diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml
index 7eec98b..2724878 100644
--- a/app/src/main/res/layout/activity_cart.xml
+++ b/app/src/main/res/layout/activity_cart.xml
@@ -73,7 +73,7 @@
             android:id="@+id/cart_order_total"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="5dp"
+            android:padding="@dimen/cart_footer_padding"
             android:textSize="@dimen/cart_order_total_size"
             android:text="@string/cart_order_total"
             app:layout_constraintBottom_toTopOf="@id/cart_subtotal"
@@ -84,9 +84,9 @@
             android:id="@+id/cart_order_total_value"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="5dp"
+            android:padding="@dimen/cart_footer_padding"
             android:textSize="@dimen/cart_order_total_size"
-            android:text="@string/cart_oder_total_value"
+            android:text="@string/cart_order_total_value"
             android:textAlignment="textEnd"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -98,7 +98,7 @@
             android:id="@+id/cart_subtotal"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="5dp"
+            android:padding="@dimen/cart_footer_padding"
             android:text="@string/cart_subtotal"
             app:layout_constraintBottom_toTopOf="@id/cart_shipping"
             app:layout_constraintStart_toStartOf="parent"
@@ -108,7 +108,7 @@
             android:id="@+id/cart_subtotal_value"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="5dp"
+            android:padding="@dimen/cart_footer_padding"
             android:text="@string/cart_subtotal_value"
             android:textAlignment="textEnd"
             app:layout_constraintEnd_toEndOf="parent"
@@ -121,7 +121,7 @@
             android:id="@+id/cart_shipping"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="5dp"
+            android:padding="@dimen/cart_footer_padding"
             android:text="@string/cart_shipping"
             app:layout_constraintBottom_toTopOf="@id/cart_tax"
             app:layout_constraintStart_toStartOf="parent"
@@ -131,7 +131,7 @@
             android:id="@+id/cart_shipping_value"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="5dp"
+            android:padding="@dimen/cart_footer_padding"
             android:text="@string/cart_shipping_value"
             android:textAlignment="textEnd"
             app:layout_constraintEnd_toEndOf="parent"
@@ -144,7 +144,7 @@
             android:id="@+id/cart_tax"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="5dp"
+            android:padding="@dimen/cart_footer_padding"
             android:text="@string/cart_tax"
             app:layout_constraintBottom_toTopOf="@id/cart_place_order"
             app:layout_constraintStart_toStartOf="parent"
@@ -154,7 +154,7 @@
             android:id="@+id/cart_tax_value"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="5dp"
+            android:padding="@dimen/cart_footer_padding"
             android:text="@string/cart_tax_value"
             android:textAlignment="textEnd"
             app:layout_constraintEnd_toEndOf="parent"
@@ -168,7 +168,7 @@
             style="@style/Widget.Material3.Button.Main"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Place order"
+            android:text="@string/cart_place_order"
             app:flow_horizontalAlign="center"
             app:icon="@drawable/mood"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 59ca898..3399a7e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -10,4 +10,5 @@
     <dimen name="cart_item_padding">10dp</dimen>
     <dimen name="cart_item_name_size">28sp</dimen>
     <dimen name="cart_order_total_size">25sp</dimen>
+    <dimen name="cart_footer_padding">5dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c0a6590..1974afa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,13 +37,14 @@
     <string name="signin_placeholder_password">password322</string>
     <string name="signin_button_login">Login</string>
     <string name="cart_order_total">Order Total:</string>
-    <string name="cart_oder_total_value">175.50</string>
+    <string name="cart_order_total_value">175.50</string>
     <string name="cart_subtotal">Subtotal:</string>
     <string name="cart_subtotal_value">$140</string>
     <string name="cart_shipping">Shipping:</string>
     <string name="cart_shipping_value">$25</string>
     <string name="cart_tax">Tax:</string>
     <string name="cart_tax_value">$10.50</string>
+    <string name="cart_place_order">Place order</string>
 
     <plurals name="cart_items_count">
         <item quantity="one">%1$d item in your cart</item>

From 44f9ab877384347cc4225ab407b33a212c29dc9b Mon Sep 17 00:00:00 2001
From: Anv0l <andrei.voloshin@live.com>
Date: Sun, 13 Apr 2025 17:05:12 +0300
Subject: [PATCH 4/4] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20#2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/cart_item.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/cart_item.xml b/app/src/main/res/layout/cart_item.xml
index 010dc5a..81c9ada 100644
--- a/app/src/main/res/layout/cart_item.xml
+++ b/app/src/main/res/layout/cart_item.xml
@@ -1,6 +1,7 @@
 <?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"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:focusable="true"
@@ -39,7 +40,8 @@
         android:text="@string/cart_item_placeholder_category"
         app:layout_constraintEnd_toStartOf="@id/cart_item_price"
         app:layout_constraintStart_toEndOf="@id/cart_item_image"
-        app:layout_constraintTop_toBottomOf="@id/cart_item_name" />
+        app:layout_constraintTop_toBottomOf="@id/cart_item_name"
+        tools:ignore="RtlSymmetry" />
 
     <TextView
         android:id="@+id/cart_item_extra"
@@ -51,7 +53,8 @@
         android:text="@string/cart_item_placeholder_extra"
         app:layout_constraintEnd_toStartOf="@id/cart_item_price"
         app:layout_constraintStart_toEndOf="@id/cart_item_image"
-        app:layout_constraintTop_toBottomOf="@id/cart_item_category" />
+        app:layout_constraintTop_toBottomOf="@id/cart_item_category"
+        tools:ignore="RtlSymmetry" />
 
     <TextView
         android:id="@+id/cart_item_price"