From 7a82a3f94af76c77ae1bdf488d9a2cc3785da204 Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Thu, 19 Dec 2024 13:36:25 +0300
Subject: [PATCH 01/13] add menu on topAppBar

---
 .../viewandresources/ContactsActivity.kt      | 10 +++++++++
 .../homework/viewandresources/MainActivity.kt |  1 +
 .../res/drawable/baseline_attach_file_24.xml  | 12 +++++++++++
 app/src/main/res/layout/activity_contacts.xml | 18 ++++++++++++++++
 app/src/main/res/layout/main_toolbar.xml      | 10 +++++++++
 app/src/main/res/menu/main_menu.xml           | 21 +++++++++++++++++++
 app/src/main/res/values-night/themes.xml      |  1 +
 app/src/main/res/values/strings.xml           |  4 ++++
 app/src/main/res/values/themes.xml            |  1 +
 9 files changed, 78 insertions(+)
 create mode 100644 app/src/main/res/drawable/baseline_attach_file_24.xml
 create mode 100644 app/src/main/res/layout/main_toolbar.xml
 create mode 100644 app/src/main/res/menu/main_menu.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..bb1b4fc 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/ContactsActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/ContactsActivity.kt
@@ -2,10 +2,20 @@ package otus.gpb.homework.viewandresources
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import androidx.appcompat.widget.Toolbar
 
 class ContactsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_contacts)
+       setSupportActionBar(findViewById<Toolbar>(R.id.topAppBar))
     }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.main_menu, menu)
+        return true
+    }
+
 }
\ 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..0669168 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/MainActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/MainActivity.kt
@@ -2,6 +2,7 @@ package otus.gpb.homework.viewandresources
 
 import android.content.Intent
 import android.os.Bundle
+import android.view.Menu
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
diff --git a/app/src/main/res/drawable/baseline_attach_file_24.xml b/app/src/main/res/drawable/baseline_attach_file_24.xml
new file mode 100644
index 0000000..615ac2c
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_attach_file_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:tint="?attr/colorOnBackground"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16.5,6v11.5c0,2.21 -1.79,4 -4,4s-4,-1.79 -4,-4V5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5v10.5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V6H10v9.5c0,1.38 1.12,2.5 2.5,2.5s2.5,-1.12 2.5,-2.5V5c0,-2.21 -1.79,-4 -4,-4S7,2.79 7,5v12.5c0,3.04 2.46,5.5 5.5,5.5s5.5,-2.46 5.5,-5.5V6h-1.5z" />
+
+</vector>
diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml
index 6ef087b..ef2af60 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -6,4 +6,22 @@
     android:layout_height="match_parent"
     tools:context=".ContactsActivity">
 
+    <include layout="@layout/main_toolbar">
+    </include>
+
+    <LinearLayout
+        android:layout_width="0.dp"
+        android:layout_height="0.dp"
+        android:background="@color/black"
+        android:orientation="vertical"
+
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/topAppBar">
+
+    </LinearLayout>
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_toolbar.xml b/app/src/main/res/layout/main_toolbar.xml
new file mode 100644
index 0000000..36814a7
--- /dev/null
+++ b/app/src/main/res/layout/main_toolbar.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+
+    android:id="@+id/topAppBar"
+    android:layout_width="match_parent"
+    android:layout_height="46.dp"
+    android:theme="@style/Theme.Material3.DayNight.NoActionBar"
+    >
+
+</androidx.appcompat.widget.Toolbar>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
new file mode 100644
index 0000000..2b98080
--- /dev/null
+++ b/app/src/main/res/menu/main_menu.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="1"
+        android:title="@string/settings" />
+    <item
+        android:id="@+id/save_settings"
+        android:orderInCategory="3"
+        android:title="@string/save" />
+    <item
+        android:id="@+id/open_settings"
+        android:orderInCategory="2"
+        android:title="@string/open" />
+    <item
+        android:id="@+id/open_attach"
+        android:title="@string/attach"
+        android:icon="@drawable/baseline_attach_file_24"
+        app:showAsAction="ifRoom" />
+</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..3a1bae7 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -3,5 +3,6 @@
     <style name="Base.Theme.ViewResources" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your dark theme here. -->
         <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
+
     </style>
 </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..f43adb8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,7 @@
 <resources>
     <string name="app_name">View &amp; Resources</string>
+    <string name="open">Open</string>
+    <string name="save">Save</string>
+    <string name="attach">attach</string>
+    <string name="settings">Settings</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 62ec3ea..802f52f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,6 +3,7 @@
     <style name="Base.Theme.ViewResources" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
+
     </style>
 
     <style name="Theme.ViewResources" parent="Base.Theme.ViewResources" />

From 960bf9031e802ba416b3a2ed39507dbfabb45097 Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Thu, 19 Dec 2024 14:36:31 +0300
Subject: [PATCH 02/13] finish topAppBar

---
 .../gpb/homework/viewandresources/CartActivity.kt   | 11 +++++++++++
 .../homework/viewandresources/ContactsActivity.kt   |  6 ++++--
 .../gpb/homework/viewandresources/MainActivity.kt   |  1 -
 .../main/res/drawable/baseline_arrow_back_24.xml    | 13 +++++++++++++
 app/src/main/res/layout/activity_cart.xml           |  3 +++
 app/src/main/res/layout/dialog_signin.xml           |  1 +
 app/src/main/res/layout/main_toolbar.xml            |  3 +++
 app/src/main/res/values/strings.xml                 |  2 ++
 8 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_arrow_back_24.xml

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..dcd0d3c 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,22 @@
 package otus.gpb.homework.viewandresources
 
+import android.annotation.SuppressLint
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.Menu
+import androidx.appcompat.widget.Toolbar
 
 class CartActivity : AppCompatActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_cart)
+        setContentView(R.layout.activity_contacts)
+        setSupportActionBar(findViewById<Toolbar>(R.id.topAppBar))
+
+    }
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.main_menu, menu)
+        return true
     }
 }
\ No newline at end of file
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 bb1b4fc..8da4a1d 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/ContactsActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/ContactsActivity.kt
@@ -3,14 +3,16 @@ package otus.gpb.homework.viewandresources
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.Menu
-import android.view.MenuInflater
 import androidx.appcompat.widget.Toolbar
 
 class ContactsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_contacts)
-       setSupportActionBar(findViewById<Toolbar>(R.id.topAppBar))
+
+        var toolbar = findViewById<Toolbar>(R.id.topAppBar)
+        toolbar.setTitle(R.string.personName)
+        setSupportActionBar(findViewById<Toolbar>(R.id.topAppBar))
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
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 0669168..22b779c 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/MainActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/MainActivity.kt
@@ -2,7 +2,6 @@ package otus.gpb.homework.viewandresources
 
 import android.content.Intent
 import android.os.Bundle
-import android.view.Menu
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
diff --git a/app/src/main/res/drawable/baseline_arrow_back_24.xml b/app/src/main/res/drawable/baseline_arrow_back_24.xml
new file mode 100644
index 0000000..eed1897
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_arrow_back_24.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorOnBackground"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+
+</vector>
diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml
index 57dc4d4..b4b63a7 100644
--- a/app/src/main/res/layout/activity_cart.xml
+++ b/app/src/main/res/layout/activity_cart.xml
@@ -6,4 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".CartActivity">
 
+    <include layout="@layout/main_toolbar">
+    </include>
+
 </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..63d12a4 100644
--- a/app/src/main/res/layout/dialog_signin.xml
+++ b/app/src/main/res/layout/dialog_signin.xml
@@ -3,4 +3,5 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_toolbar.xml b/app/src/main/res/layout/main_toolbar.xml
index 36814a7..bc259ed 100644
--- a/app/src/main/res/layout/main_toolbar.xml
+++ b/app/src/main/res/layout/main_toolbar.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
 
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/topAppBar"
     android:layout_width="match_parent"
     android:layout_height="46.dp"
     android:theme="@style/Theme.Material3.DayNight.NoActionBar"
+    app:navigationIcon="@drawable/baseline_arrow_back_24"
     >
 
+
 </androidx.appcompat.widget.Toolbar>
\ 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 f43adb8..058fe14 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,4 +4,6 @@
     <string name="save">Save</string>
     <string name="attach">attach</string>
     <string name="settings">Settings</string>
+    <string name="back">back</string>
+    <string name="personName">Ivan Petrov</string>
 </resources>
\ No newline at end of file

From f23b03ea089b9605c26119aff1ab9d7996d08f4f Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Thu, 19 Dec 2024 16:19:37 +0300
Subject: [PATCH 03/13] add some person field

---
 app/src/main/res/layout/activity_contacts.xml |  9 ++--
 .../res/layout/person_address_text_field.xml  | 15 ++++++
 .../res/layout/person_name_text_field.xml     | 15 ++++++
 .../main/res/layout/person_phone_block.xml    | 48 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  4 ++
 5 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/layout/person_address_text_field.xml
 create mode 100644 app/src/main/res/layout/person_name_text_field.xml
 create mode 100644 app/src/main/res/layout/person_phone_block.xml

diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml
index ef2af60..6dfdfd1 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -6,14 +6,13 @@
     android:layout_height="match_parent"
     tools:context=".ContactsActivity">
 
-    <include layout="@layout/main_toolbar">
-    </include>
+    <include layout="@layout/main_toolbar" />
 
     <LinearLayout
         android:layout_width="0.dp"
         android:layout_height="0.dp"
-        android:background="@color/black"
         android:orientation="vertical"
+        android:layout_margin="10.dp"
 
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -21,6 +20,10 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/topAppBar">
 
+        <include layout="@layout/person_name_text_field" />
+        <include layout="@layout/person_phone_block" />
+        <include layout="@layout/person_address_text_field" />
+
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/person_address_text_field.xml b/app/src/main/res/layout/person_address_text_field.xml
new file mode 100644
index 0000000..2607f2f
--- /dev/null
+++ b/app/src/main/res/layout/person_address_text_field.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textFieldPersonName"
+    style="?attr/textInputFilledDenseStyle"
+    android:layout_width="match_parent"
+    android:layout_height="55.dp"
+    android:hint="@string/address"
+    android:layout_marginTop="5.dp"
+    >
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</com.google.android.material.textfield.TextInputLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/person_name_text_field.xml b/app/src/main/res/layout/person_name_text_field.xml
new file mode 100644
index 0000000..d190b8f
--- /dev/null
+++ b/app/src/main/res/layout/person_name_text_field.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textFieldPersonName"
+    style="?attr/textInputFilledDenseStyle"
+    android:layout_width="match_parent"
+    android:layout_height="55.dp"
+    android:hint="@string/nameHint"
+    android:layout_marginTop="5.dp"
+    >
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</com.google.android.material.textfield.TextInputLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/person_phone_block.xml b/app/src/main/res/layout/person_phone_block.xml
new file mode 100644
index 0000000..68b2601
--- /dev/null
+++ b/app/src/main/res/layout/person_phone_block.xml
@@ -0,0 +1,48 @@
+<?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:layout_marginTop="5.dp"
+    android:orientation="horizontal">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textFieldPersonPhone"
+        style="?attr/textInputFilledDenseStyle"
+        android:layout_width="213.dp"
+        android:layout_height="56.dp"
+        android:hint="@string/phone"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="MissingConstraints">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textFieldPersonPhoneType"
+        style="?attr/textInputFilledDenseStyle"
+        android:layout_width="160.dp"
+        android:layout_height="56.dp"
+        android:hint="@string/selectPhoneType"
+        android:layout_marginStart="18.dp"
+
+        app:layout_constraintStart_toEndOf="@+id/textFieldPersonPhone"
+        tools:layout_editor_absoluteX="16.dp"
+        tools:ignore="MissingConstraints">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 058fe14..51315c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,4 +6,8 @@
     <string name="settings">Settings</string>
     <string name="back">back</string>
     <string name="personName">Ivan Petrov</string>
+    <string name="nameHint">name</string>
+    <string name="phone">phone</string>
+    <string name="selectPhoneType">select</string>
+    <string name="address">address</string>
 </resources>
\ No newline at end of file

From 8c64545b333e8ef9bb5579e3b43f0bcff90ef91b Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Thu, 19 Dec 2024 19:26:55 +0300
Subject: [PATCH 04/13] contact is done

---
 app/src/main/res/drawable/address.xml         | 10 ++++
 app/src/main/res/drawable/baseline_mic_24.xml | 12 +++++
 .../drawable/baseline_perm_identity_24.xml    | 12 +++++
 app/src/main/res/drawable/calendar.xml        | 10 ++++
 app/src/main/res/drawable/drop.xml            | 10 ++++
 app/src/main/res/layout/activity_contacts.xml | 20 +++++++-
 .../res/layout/person_address_text_field.xml  |  5 +-
 .../res/layout/person_birthday_text_field.xml | 18 +++++++
 app/src/main/res/layout/person_city_block.xml | 48 +++++++++++++++++++
 .../res/layout/person_name_text_field.xml     |  4 ++
 .../res/layout/person_notes_text_field.xml    | 18 +++++++
 .../main/res/layout/person_phone_block.xml    | 13 +++--
 app/src/main/res/values-night/themes.xml      |  2 +
 app/src/main/res/values/colors.xml            |  2 +
 app/src/main/res/values/strings.xml           | 13 +++--
 app/src/main/res/values/themes.xml            |  3 +-
 16 files changed, 187 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable/address.xml
 create mode 100644 app/src/main/res/drawable/baseline_mic_24.xml
 create mode 100644 app/src/main/res/drawable/baseline_perm_identity_24.xml
 create mode 100644 app/src/main/res/drawable/calendar.xml
 create mode 100644 app/src/main/res/drawable/drop.xml
 create mode 100644 app/src/main/res/layout/person_birthday_text_field.xml
 create mode 100644 app/src/main/res/layout/person_city_block.xml
 create mode 100644 app/src/main/res/layout/person_notes_text_field.xml

diff --git a/app/src/main/res/drawable/address.xml b/app/src/main/res/drawable/address.xml
new file mode 100644
index 0000000..ee4a635
--- /dev/null
+++ b/app/src/main/res/drawable/address.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="18dp"
+    android:viewportWidth="14"
+    android:tint="?attr/colorOnBackground"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M0,18V2C0,1.45 0.196,0.979 0.587,0.587C0.979,0.196 1.45,0 2,0H12C12.55,0 13.021,0.196 13.413,0.587C13.804,0.979 14,1.45 14,2V18L7,15L0,18ZM2,14.95L7,12.8L12,14.95V2H2V14.95Z"
+      android:fillColor="#43474E"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_mic_24.xml b/app/src/main/res/drawable/baseline_mic_24.xml
new file mode 100644
index 0000000..9d4e4cd
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_mic_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorOnBackground"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z" />
+
+</vector>
diff --git a/app/src/main/res/drawable/baseline_perm_identity_24.xml b/app/src/main/res/drawable/baseline_perm_identity_24.xml
new file mode 100644
index 0000000..d732412
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_perm_identity_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorOnBackground"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z" />
+
+</vector>
diff --git a/app/src/main/res/drawable/calendar.xml b/app/src/main/res/drawable/calendar.xml
new file mode 100644
index 0000000..4cc77d2
--- /dev/null
+++ b/app/src/main/res/drawable/calendar.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="20dp"
+    android:tint="?attr/colorOnBackground"
+    android:viewportWidth="18"
+    android:viewportHeight="20">
+    <path
+        android:fillColor="#43474E"
+        android:pathData="M6,14.5C5.3,14.5 4.708,14.258 4.225,13.775C3.742,13.292 3.5,12.7 3.5,12C3.5,11.3 3.742,10.708 4.225,10.225C4.708,9.742 5.3,9.5 6,9.5C6.7,9.5 7.292,9.742 7.775,10.225C8.258,10.708 8.5,11.3 8.5,12C8.5,12.7 8.258,13.292 7.775,13.775C7.292,14.258 6.7,14.5 6,14.5ZM2,20C1.45,20 0.979,19.804 0.587,19.413C0.196,19.021 0,18.55 0,18V4C0,3.45 0.196,2.979 0.587,2.588C0.979,2.196 1.45,2 2,2H3V0H5V2H13V0H15V2H16C16.55,2 17.021,2.196 17.413,2.588C17.804,2.979 18,3.45 18,4V18C18,18.55 17.804,19.021 17.413,19.413C17.021,19.804 16.55,20 16,20H2ZM2,18H16V8H2V18Z" />
+</vector>
diff --git a/app/src/main/res/drawable/drop.xml b/app/src/main/res/drawable/drop.xml
new file mode 100644
index 0000000..b7fd08e
--- /dev/null
+++ b/app/src/main/res/drawable/drop.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="5dp"
+    android:tint="?attr/colorOnBackground"
+    android:viewportWidth="10"
+    android:viewportHeight="5">
+  <path
+      android:pathData="M5,5L0,0H10L5,5Z"
+      android:fillColor="#43474E"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml
index 6dfdfd1..b602408 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -9,10 +9,11 @@
     <include layout="@layout/main_toolbar" />
 
     <LinearLayout
-        android:layout_width="0.dp"
+        android:id="@+id/personLayout"
+        android:layout_width="match_parent"
         android:layout_height="0.dp"
-        android:orientation="vertical"
         android:layout_margin="10.dp"
+        android:orientation="vertical"
 
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -21,10 +22,25 @@
         app:layout_constraintTop_toBottomOf="@+id/topAppBar">
 
         <include layout="@layout/person_name_text_field" />
+
         <include layout="@layout/person_phone_block" />
+
         <include layout="@layout/person_address_text_field" />
 
+        <include layout="@layout/person_city_block" />
+
+        <include layout="@layout/person_birthday_text_field" />
+
+        <include layout="@layout/person_notes_text_field" />
+
     </LinearLayout>
 
+    <com.google.android.material.button.MaterialButton
+        android:layout_width="392.dp"
+        android:layout_height="40.dp"
+        android:text="@string/buttonSave"
+        app:layout_constraintBottom_toBottomOf="@+id/personLayout"
+        app:layout_constraintEnd_toEndOf="@+id/personLayout"
+        app:layout_constraintStart_toStartOf="@+id/personLayout" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/person_address_text_field.xml b/app/src/main/res/layout/person_address_text_field.xml
index 2607f2f..dc08b05 100644
--- a/app/src/main/res/layout/person_address_text_field.xml
+++ b/app/src/main/res/layout/person_address_text_field.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/textFieldPersonName"
     style="?attr/textInputFilledDenseStyle"
     android:layout_width="match_parent"
     android:layout_height="55.dp"
     android:hint="@string/address"
     android:layout_marginTop="5.dp"
-    >
+    app:endIconMode="custom"
+    app:endIconDrawable="@drawable/address">
 
     <com.google.android.material.textfield.TextInputEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
+
 </com.google.android.material.textfield.TextInputLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/person_birthday_text_field.xml b/app/src/main/res/layout/person_birthday_text_field.xml
new file mode 100644
index 0000000..b7efc78
--- /dev/null
+++ b/app/src/main/res/layout/person_birthday_text_field.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/textFieldPersonBirthday"
+    style="?attr/textInputFilledDenseStyle"
+    android:layout_width="match_parent"
+    android:layout_height="55.dp"
+    android:hint="@string/date"
+    android:layout_marginTop="5.dp"
+    app:endIconMode="custom"
+    app:endIconDrawable="@drawable/calendar">
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+
+</com.google.android.material.textfield.TextInputLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/person_city_block.xml b/app/src/main/res/layout/person_city_block.xml
new file mode 100644
index 0000000..14398fd
--- /dev/null
+++ b/app/src/main/res/layout/person_city_block.xml
@@ -0,0 +1,48 @@
+<?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:layout_marginTop="5.dp"
+    android:orientation="horizontal">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textFieldPersonCity"
+        style="?attr/textInputFilledDenseStyle"
+        android:layout_width="213.dp"
+        android:layout_height="56.dp"
+        android:hint="@string/city"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="MissingConstraints">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textFieldPersonCountry"
+        style="?attr/textInputFilledDenseStyle"
+        android:layout_width="160.dp"
+        android:layout_height="56.dp"
+        android:hint="@string/country"
+        android:layout_marginStart="18.dp"
+
+        app:layout_constraintStart_toEndOf="@+id/textFieldPersonCity"
+        tools:layout_editor_absoluteX="16.dp"
+        tools:ignore="MissingConstraints">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/person_name_text_field.xml b/app/src/main/res/layout/person_name_text_field.xml
index d190b8f..bccf091 100644
--- a/app/src/main/res/layout/person_name_text_field.xml
+++ b/app/src/main/res/layout/person_name_text_field.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/textFieldPersonName"
     style="?attr/textInputFilledDenseStyle"
     android:layout_width="match_parent"
     android:layout_height="55.dp"
     android:hint="@string/nameHint"
     android:layout_marginTop="5.dp"
+    app:endIconMode="custom"
+    app:endIconDrawable="@drawable/baseline_perm_identity_24"
+
     >
 
     <com.google.android.material.textfield.TextInputEditText
diff --git a/app/src/main/res/layout/person_notes_text_field.xml b/app/src/main/res/layout/person_notes_text_field.xml
new file mode 100644
index 0000000..10e498a
--- /dev/null
+++ b/app/src/main/res/layout/person_notes_text_field.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/textFieldPersonNotes"
+    style="?attr/textInputFilledDenseStyle"
+    android:layout_width="match_parent"
+    android:layout_height="55.dp"
+    android:hint="@string/notes"
+    android:layout_marginTop="5.dp"
+    app:endIconMode="custom"
+    app:endIconDrawable="@drawable/baseline_mic_24">
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+
+</com.google.android.material.textfield.TextInputLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/person_phone_block.xml b/app/src/main/res/layout/person_phone_block.xml
index 68b2601..34d68a5 100644
--- a/app/src/main/res/layout/person_phone_block.xml
+++ b/app/src/main/res/layout/person_phone_block.xml
@@ -15,7 +15,10 @@
         android:hint="@string/phone"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        tools:ignore="MissingConstraints">
+        tools:ignore="MissingConstraints"
+        app:endIconMode="custom"
+        app:endIconDrawable="@drawable/phone"
+        >
 
         <com.google.android.material.textfield.TextInputEditText
             android:layout_width="match_parent"
@@ -33,7 +36,10 @@
 
         app:layout_constraintStart_toEndOf="@+id/textFieldPersonPhone"
         tools:layout_editor_absoluteX="16.dp"
-        tools:ignore="MissingConstraints">
+        tools:ignore="MissingConstraints"
+        app:endIconMode="custom"
+        app:endIconDrawable="@drawable/drop"
+        >
 
         <com.google.android.material.textfield.TextInputEditText
             android:layout_width="match_parent"
@@ -42,7 +48,4 @@
     </com.google.android.material.textfield.TextInputLayout>
 
 
-
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 3a1bae7..65d14fe 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -3,6 +3,8 @@
     <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="colorPrimary">@color/buttonNight</item>
+        <item name="colorOnPrimary">#04305F</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..c50e23e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="buttonDay">#FF3E5F90</color>
+    <color name="buttonNight">#FFA7C8FF</color>
 </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 51315c9..da845e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,8 +6,13 @@
     <string name="settings">Settings</string>
     <string name="back">back</string>
     <string name="personName">Ivan Petrov</string>
-    <string name="nameHint">name</string>
-    <string name="phone">phone</string>
-    <string name="selectPhoneType">select</string>
-    <string name="address">address</string>
+    <string name="nameHint">Name</string>
+    <string name="phone">Phone</string>
+    <string name="selectPhoneType">Select</string>
+    <string name="address">Address</string>
+    <string name="city">City</string>
+    <string name="country">Country</string>
+    <string name="date">Date</string>
+    <string name="notes">Notes</string>
+    <string name="buttonSave">Save</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 802f52f..efd093c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,7 +3,8 @@
     <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="colorPrimary">@color/buttonDay</item>
+        <item name="colorOnPrimary">@color/white</item>
     </style>
 
     <style name="Theme.ViewResources" parent="Base.Theme.ViewResources" />

From 257c86f48e91de869d0a9afe232617fd2af558e1 Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Thu, 19 Dec 2024 19:27:12 +0300
Subject: [PATCH 05/13] add phone icon

---
 app/src/main/res/drawable/phone.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 app/src/main/res/drawable/phone.xml

diff --git a/app/src/main/res/drawable/phone.xml b/app/src/main/res/drawable/phone.xml
new file mode 100644
index 0000000..828cfc4
--- /dev/null
+++ b/app/src/main/res/drawable/phone.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="22dp"
+    android:tint="?attr/colorOnBackground"
+    android:viewportWidth="18"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M2,22C1.45,22 0.979,21.804 0.587,21.413C0.196,21.021 0,20.55 0,20V2C0,1.45 0.196,0.979 0.587,0.587C0.979,0.196 1.45,0 2,0H12C12.55,0 13.021,0.196 13.413,0.587C13.804,0.979 14,1.45 14,2V6H12V5H2V17H12V16H14V20C14,20.55 13.804,21.021 13.413,21.413C13.021,21.804 12.55,22 12,22H2ZM2,19V20H12V19H2ZM10.95,15L6.7,10.75L8.1,9.35L10.95,12.2L16.6,6.55L18,7.95L10.95,15ZM2,3H12V2H2V3Z"
+      android:fillColor="#43474E"/>
+</vector>

From 04ef4a900a7567c84669499cbdcdc9e1bf748cd3 Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Thu, 19 Dec 2024 20:51:44 +0300
Subject: [PATCH 06/13] add card assets

---
 app/build.gradle                              |   4 +
 .../homework/viewandresources/CartActivity.kt |  27 +++++--
 .../viewandresources/cart/CardAdapter.kt      |   6 ++
 .../main/res/drawable-nodpi/card_image.png    | Bin 0 -> 1712 bytes
 app/src/main/res/drawable/round_close.xml     |  10 +++
 app/src/main/res/layout/activity_cart.xml     |  20 ++++-
 app/src/main/res/layout/card_item.xml         |  75 ++++++++++++++++++
 .../main/res/layout/card_recycler_view.xml    |   7 ++
 app/src/main/res/menu/main_menu_card.xml      |  10 +++
 app/src/main/res/values/strings.xml           |   3 +
 10 files changed, 155 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/otus/gpb/homework/viewandresources/cart/CardAdapter.kt
 create mode 100644 app/src/main/res/drawable-nodpi/card_image.png
 create mode 100644 app/src/main/res/drawable/round_close.xml
 create mode 100644 app/src/main/res/layout/card_item.xml
 create mode 100644 app/src/main/res/layout/card_recycler_view.xml
 create mode 100644 app/src/main/res/menu/main_menu_card.xml

diff --git a/app/build.gradle b/app/build.gradle
index debcfaf..bc2ca49 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,6 +29,10 @@ android {
     kotlinOptions {
         jvmTarget = '17'
     }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
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 dcd0d3c..8fb326d 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
@@ -1,22 +1,39 @@
 package otus.gpb.homework.viewandresources
 
-import android.annotation.SuppressLint
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.Menu
 import androidx.appcompat.widget.Toolbar
+import kotlin.collections.mutableListOf
 
 class CartActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_cart)
-        setContentView(R.layout.activity_contacts)
-        setSupportActionBar(findViewById<Toolbar>(R.id.topAppBar))
+        var toolbar = findViewById<Toolbar>(R.id.topAppBar)
+        setSupportActionBar(toolbar)
+
+        var cards = createCard()
 
     }
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.main_menu, menu)
+        menuInflater.inflate(R.menu.main_menu_card, menu)
         return true
     }
-}
\ No newline at end of file
+}
+
+private fun createCard(): MutableList<Card> {
+
+    val cards = (1..4).map {
+        Card(
+            headerTitle = "List item $it",
+        )
+    }.toMutableList()
+    return cards
+}
+
+data class Card(
+    val headerTitle: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/cart/CardAdapter.kt b/app/src/main/java/otus/gpb/homework/viewandresources/cart/CardAdapter.kt
new file mode 100644
index 0000000..b1ba18c
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/cart/CardAdapter.kt
@@ -0,0 +1,6 @@
+package otus.gpb.homework.viewandresources.cart
+
+import androidx.recyclerview.widget.RecyclerView
+
+class CardAdapter : RecyclerView.Adapter<CardAdapter.CardHolder>()  {
+}
diff --git a/app/src/main/res/drawable-nodpi/card_image.png b/app/src/main/res/drawable-nodpi/card_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ff684e4c4cbe39bc57e8b6af8b58b9e0f266e33
GIT binary patch
literal 1712
zcmV;h22c5kP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH21Q9kK~#7F?VWv6
z6G;@nU-u*d#Y7PBbE`~rtu1$}Rycv{308054LpL&4fF;aVLgHF3D7NF6vUZ)knoid
z5|RLuncnx>3MCjIGnr(1uz&yXkq;_AUU$Fux-((WBMYWEK4!yXZm@^03p0#ES_l}2
za{yyd6)sr7;VtLvO&#1<vzbh_r^lXkhegv&8!mswKs-G!!g_+iyu-!Z{Y=I>{ca~9
zBhG=p@Gj5bM~1N%jhZ_*JKH@Xy9)dob?h|=NP~tfSs0Cvx<w;D{);8koYC@*fiB3&
z`z3Sc_)SM5P)FVwbcw`6fpX4s*@BjL1}L#n6SJK;@o)&s1w+d_8+0_5;?Fxj$_SK0
z*I_1Tdd4wChK90?K%DoUgT@m^o6Gc$nK<{^4%-HeSE`M=$Z*?%$Dr}UcrwZV<d|tc
z1dT6TCjQ_|zzirzquGSYw&F93U=J_?)k|Fjb}jz<xCH-xScIKg9aKetNOKiCEL-KW
zj6kBWT9iUn1arV~4vNu4abL3e!=E=%W}#RFRZ&jh+U6#-TCF3$E0)&5aU4()r35w_
zO~@C%kG9s{p0Yz(8G#gGRz82Cq(Z3#^+p3!Lm7cI*KL(6C*E$`ZTMnkm5V|p1d^0&
zzHp|TYIO&yJ3F8fp$jBw7OuLj)?QEdrzo^-8&n~5fsJMh)^X+SmHKW2R*NN2h0q0>
z7*Tus`<@<?!xi~>suLEW3asz$LZ#Z%{`C=D+}U3(t$_-JCeUuTVR^;$y{Z;b;O15t
z!X`9<8=G4)0{!Bm_`CwibtnScZOZAazF&N;UWc`f4G5D^1X9lDI4%SMMd3k+Y0c0D
zQj@f_whlqj#59O<!>|~-z+7P!+5vY~Xg+O*l-3MY;M)2ImSQys8cJ(SD<{7Wo1qEZ
z$7Ff6G`I?)j8nt<M(-6(Pz+6A0n0Bc!v=+n!fZ~i@WW(i0*5h2(cJ0`c^I>$&z71y
zHqk&Rw<i)cw7@>m0{cV@>=P}pPqe^3(E|G<2ImN>LN>5Vy;G|}y}m2=TBt%X3=X5C
z7a(<M45lY1A(cu&EM`Cucuu701VLrH8rWGC#u;437c@FD0)C;!EY-nu2x+&`JoUbu
zF%+1DyXo7IOeUdEglB=&O?mhJL!hnn8`rMEFZb?(A80@MvuQ%P;_WadLy=dfCgI-Q
zI~a|=2cn-!L<GJMfzJqjpdq{XY00xZ`8O$Qv5!d2Sl9LcdLp}skh~8cKS8aJjVYpt
z-SOp>72iP-S%IYho3nH>qUQ4`aU=y&^jW!FU{eVV;V;=NKCkzMF_Hpl?h0yGuLCuE
z{ha)YoIuL!wgzw_fu6Tqsd#=|<OJ>?9LOWTgP`-y053#NAe{|7un%Am&`~?DL~;oC
zlee9QpXw@d0;v?EDq;{AhWGk7asp%V1jJ*5>4C)Kaqvpy1dfg*;Nry#FbFQEyf+u3
zH-tHdiSfa_z0c3{MlzAUc6Ay>20IU?u(dTgF#%qQq(JH&UY(kPAi0kJlz80x+#1<t
z!ktW7Hb#SBdh!a~ym1};5Ltl<Trq#nWcq1_N@(b2usiJ+9|D8V!I;nIOeHVDgWrCY
z5<LG+%q6F;Ou+B>_=^|(uj*`h#oG4ru5~J<=%^aiq(MOHrm?kt#m5BRfi{n<Twd;r
z^wQ#@mHhTkx8T;Tn-DYnZ!Y0q+Gfk2tp)r>$qP?-g$|q3`-<uGeiQdf+HG5weY9dH
z5(yb;Q@ATftL+Hpll{XMVuHb2Q1r?jUZHvM4$fy(FYoQ`e-$V|3LL?en{E%b3>5ET
z;D~>)z<dhl2pXbatChi2EFA=}Hyr;df73-+LF1Wb-F?L~@@lng9yDH=r)vnxG^Tyv
zz66aY99zuMS1IuR{fvc^>kH8IhF~wq8GU=0NXNK4hYOYkno}W1ja_%H^YfuVnhRZ9
zJkk<RhTM>&Z?7qRq?D6G*$_{(#P1;|%oR^ML$^cs3vn-+X&z^<@y0Z04kPclJfdqe
zf$o?v#H?OeKrR@~x|r=Ik2w3o2rwFrxV%X1Q}}VHqPTgd?Y=xoT!)?u!-WNNd~^&R
z8(dy8bOxjIHg-PF$;V-^D!!I1+ITAjdqWk*NgqCNoc{sh5(6?Y!p-0S0000<MNUMn
GLSTaFs2D;3

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/round_close.xml b/app/src/main/res/drawable/round_close.xml
new file mode 100644
index 0000000..5cbee6d
--- /dev/null
+++ b/app/src/main/res/drawable/round_close.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:tint="?attr/colorOnBackground"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M6.4,15L10,11.4L13.6,15L15,13.6L11.4,10L15,6.4L13.6,5L10,8.6L6.4,5L5,6.4L8.6,10L5,13.6L6.4,15ZM10,20C8.617,20 7.317,19.737 6.1,19.212C4.883,18.688 3.825,17.975 2.925,17.075C2.025,16.175 1.313,15.117 0.788,13.9C0.262,12.683 0,11.383 0,10C0,8.617 0.262,7.317 0.788,6.1C1.313,4.883 2.025,3.825 2.925,2.925C3.825,2.025 4.883,1.313 6.1,0.788C7.317,0.262 8.617,0 10,0C11.383,0 12.683,0.262 13.9,0.788C15.117,1.313 16.175,2.025 17.075,2.925C17.975,3.825 18.688,4.883 19.212,6.1C19.737,7.317 20,8.617 20,10C20,11.383 19.737,12.683 19.212,13.9C18.688,15.117 17.975,16.175 17.075,17.075C16.175,17.975 15.117,18.688 13.9,19.212C12.683,19.737 11.383,20 10,20ZM10,18C12.233,18 14.125,17.225 15.675,15.675C17.225,14.125 18,12.233 18,10C18,7.767 17.225,5.875 15.675,4.325C14.125,2.775 12.233,2 10,2C7.767,2 5.875,2.775 4.325,4.325C2.775,5.875 2,7.767 2,10C2,12.233 2.775,14.125 4.325,15.675C5.875,17.225 7.767,18 10,18Z"
+      android:fillColor="#C4C6CF"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml
index b4b63a7..e395507 100644
--- a/app/src/main/res/layout/activity_cart.xml
+++ b/app/src/main/res/layout/activity_cart.xml
@@ -6,7 +6,23 @@
     android:layout_height="match_parent"
     tools:context=".CartActivity">
 
-    <include layout="@layout/main_toolbar">
-    </include>
+    <include layout="@layout/main_toolbar" />
+
+    <LinearLayout
+        android:id="@+id/personLayout"
+        android:layout_width="match_parent"
+        android:layout_height="0.dp"
+        android:layout_margin="10.dp"
+        android:orientation="vertical"
+
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/topAppBar">
+
+        <include layout="@layout/card_recycler_view" />
+
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_item.xml b/app/src/main/res/layout/card_item.xml
new file mode 100644
index 0000000..23ab527
--- /dev/null
+++ b/app/src/main/res/layout/card_item.xml
@@ -0,0 +1,75 @@
+<?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="105.dp"
+    android:id="@+id/cardItem"
+>
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="80.dp"
+        android:layout_height="80.dp"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@string/card_image"
+        android:src="@drawable/card_image"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.5" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="222.dp"
+        android:layout_height="76.dp"
+        android:layout_marginStart="16dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/imageView"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/header_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/list_item_number"
+            tools:ignore="MissingConstraints" />
+
+        <TextView
+            android:id="@+id/category"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/list_item_number"
+            tools:ignore="MissingConstraints" />
+
+        <TextView
+            android:id="@+id/supporting"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/list_item_number"
+            tools:ignore="MissingConstraints" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:text="@string/price"
+        app:layout_constraintStart_toEndOf="@+id/linearLayout"
+        app:layout_constraintTop_toTopOf="@+id/linearLayout" />
+
+    <View
+        android:layout_width="0.dp"
+        android:layout_height="2.dp"
+        android:background="@android:color/darker_gray"
+        android:paddingStart="6.dp"
+        android:paddingEnd="6.dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/textView"
+        app:layout_constraintStart_toStartOf="@+id/imageView" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_recycler_view.xml b/app/src/main/res/layout/card_recycler_view.xml
new file mode 100644
index 0000000..4302ca4
--- /dev/null
+++ b/app/src/main/res/layout/card_recycler_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+</androidx.recyclerview.widget.RecyclerView>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main_menu_card.xml b/app/src/main/res/menu/main_menu_card.xml
new file mode 100644
index 0000000..c098a6e
--- /dev/null
+++ b/app/src/main/res/menu/main_menu_card.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/open_attach"
+        android:title="@string/attach"
+        android:icon="@drawable/round_close"
+        app:showAsAction="ifRoom" />
+</menu>
\ 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 da845e2..fee6681 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,4 +15,7 @@
     <string name="date">Date</string>
     <string name="notes">Notes</string>
     <string name="buttonSave">Save</string>
+    <string name="card_image">card image</string>
+    <string name="list_item_number">List item 1</string>
+    <string name="price">$35</string>
 </resources>
\ No newline at end of file

From 9cea33822e0ac946978c0a0245494201c247939a Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Sat, 11 Jan 2025 11:04:51 +0300
Subject: [PATCH 07/13] add CartAdapter

---
 .../homework/viewandresources/CartActivity.kt |  37 +++++++++--------
 .../viewandresources/cart/CardAdapter.kt      |   6 ---
 .../viewandresources/cart/CartAdapter.kt      |  38 ++++++++++++++++++
 .../viewandresources/cart/CartData.kt         |   9 +++++
 .../viewandresources/cart/CartViewHolder.kt   |  26 ++++++++++++
 .../{card_image.png => cart_image.png}        | Bin
 app/src/main/res/layout/activity_cart.xml     |   2 +-
 app/src/main/res/layout/activity_main.xml     |   6 +--
 .../layout/{card_item.xml => cart_item.xml}   |  10 ++---
 ...cycler_view.xml => cart_recycler_view.xml} |   4 ++
 app/src/main/res/values/strings.xml           |   5 ++-
 11 files changed, 111 insertions(+), 32 deletions(-)
 delete mode 100644 app/src/main/java/otus/gpb/homework/viewandresources/cart/CardAdapter.kt
 create mode 100644 app/src/main/java/otus/gpb/homework/viewandresources/cart/CartAdapter.kt
 create mode 100644 app/src/main/java/otus/gpb/homework/viewandresources/cart/CartData.kt
 create mode 100644 app/src/main/java/otus/gpb/homework/viewandresources/cart/CartViewHolder.kt
 rename app/src/main/res/drawable-nodpi/{card_image.png => cart_image.png} (100%)
 rename app/src/main/res/layout/{card_item.xml => cart_item.xml} (92%)
 rename app/src/main/res/layout/{card_recycler_view.xml => cart_recycler_view.xml} (58%)

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 8fb326d..3e9a209 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
@@ -4,36 +4,41 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.Menu
 import androidx.appcompat.widget.Toolbar
-import kotlin.collections.mutableListOf
+import androidx.recyclerview.widget.RecyclerView
+import otus.gpb.homework.viewandresources.cart.CartAdapter
+import otus.gpb.homework.viewandresources.cart.CartData
 
 class CartActivity : AppCompatActivity() {
 
+    private val cartAdapter: CartAdapter by lazy { CartAdapter() }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_cart)
         var toolbar = findViewById<Toolbar>(R.id.topAppBar)
         setSupportActionBar(toolbar)
 
-        var cards = createCard()
-
+        val recyclerView = findViewById<RecyclerView>(R.id.cartRW)
+        recyclerView.adapter = cartAdapter
+        cartAdapter.createCarts(createCarts())
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.main_menu_card, menu)
         return true
     }
-}
 
-private fun createCard(): MutableList<Card> {
-
-    val cards = (1..4).map {
-        Card(
-            headerTitle = "List item $it",
-        )
-    }.toMutableList()
-    return cards
+    private fun createCarts(): List<CartData> {
+
+        val carts = (1..4).map {
+            CartData(
+                headerTitle = "List item $it",
+                image = R.drawable.cart_image,
+                category = "category",
+                supporting = "Supporting line text lorem ipsum dolor sit amet, consectetur.",
+                price = "$35",
+            )
+        }.toList()
+        return carts
+    }
 }
-
-data class Card(
-    val headerTitle: String
-)
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/cart/CardAdapter.kt b/app/src/main/java/otus/gpb/homework/viewandresources/cart/CardAdapter.kt
deleted file mode 100644
index b1ba18c..0000000
--- a/app/src/main/java/otus/gpb/homework/viewandresources/cart/CardAdapter.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package otus.gpb.homework.viewandresources.cart
-
-import androidx.recyclerview.widget.RecyclerView
-
-class CardAdapter : RecyclerView.Adapter<CardAdapter.CardHolder>()  {
-}
diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/cart/CartAdapter.kt b/app/src/main/java/otus/gpb/homework/viewandresources/cart/CartAdapter.kt
new file mode 100644
index 0000000..5ea8747
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/cart/CartAdapter.kt
@@ -0,0 +1,38 @@
+package otus.gpb.homework.viewandresources.cart
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import otus.gpb.homework.viewandresources.R
+
+class CartAdapter : RecyclerView.Adapter<CartViewHolder>() {
+    private var carts = listOf<CartData>()
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): CartViewHolder {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.cart_item, parent, false)
+
+        return CartViewHolder(view)
+    }
+
+    override fun onBindViewHolder(
+        holder: CartViewHolder,
+        position: Int
+    ) {
+        val item = carts.getOrNull(position)
+        item?.let {
+            holder.bind(it)
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return carts.size
+    }
+
+    fun createCarts(newCarts: List<CartData>) {
+        carts = newCarts
+    }
+}
diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/cart/CartData.kt b/app/src/main/java/otus/gpb/homework/viewandresources/cart/CartData.kt
new file mode 100644
index 0000000..94917a1
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/cart/CartData.kt
@@ -0,0 +1,9 @@
+package otus.gpb.homework.viewandresources.cart
+
+data class CartData(
+    val image: Int,
+    val headerTitle: String,
+    val category: String,
+    val supporting: String,
+    val price: String,
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/cart/CartViewHolder.kt b/app/src/main/java/otus/gpb/homework/viewandresources/cart/CartViewHolder.kt
new file mode 100644
index 0000000..f91b69f
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/cart/CartViewHolder.kt
@@ -0,0 +1,26 @@
+package otus.gpb.homework.viewandresources.cart
+
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import otus.gpb.homework.viewandresources.R
+
+class CartViewHolder(
+    private val viewCartItem: View,
+) : RecyclerView.ViewHolder(viewCartItem) {
+
+    private val image: ImageView by lazy { viewCartItem.findViewById(R.id.imageView) }
+    private val headerTitle: TextView by lazy { viewCartItem.findViewById(R.id.header_title) }
+    private val category: TextView by lazy { viewCartItem.findViewById(R.id.category) }
+    private val supporting: TextView by lazy { viewCartItem.findViewById(R.id.supporting) }
+    private val price: TextView by lazy { viewCartItem.findViewById(R.id.price) }
+
+    fun bind(items: CartData) {
+        image.setImageResource(items.image)
+        headerTitle.text = items.headerTitle
+        category.text = items.category
+        supporting.text = items.supporting
+        price.text = items.price
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/card_image.png b/app/src/main/res/drawable-nodpi/cart_image.png
similarity index 100%
rename from app/src/main/res/drawable-nodpi/card_image.png
rename to app/src/main/res/drawable-nodpi/cart_image.png
diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml
index e395507..63bfab6 100644
--- a/app/src/main/res/layout/activity_cart.xml
+++ b/app/src/main/res/layout/activity_cart.xml
@@ -21,7 +21,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/topAppBar">
 
-        <include layout="@layout/card_recycler_view" />
+        <include layout="@layout/cart_recycler_view" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8ce09de..10fb998 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,7 +10,7 @@
         android:id="@+id/cart_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="open cart"
+        android:text="@string/open_cart"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -20,7 +20,7 @@
         android:id="@+id/signin_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="show sign in dialog"
+        android:text="@string/show_sign_in_dialog"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/cart_button" />
@@ -29,7 +29,7 @@
         android:id="@+id/contacts_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="open contacts"
+        android:text="@string/open_contacts"
         app:layout_constraintBottom_toTopOf="@+id/cart_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/card_item.xml b/app/src/main/res/layout/cart_item.xml
similarity index 92%
rename from app/src/main/res/layout/card_item.xml
rename to app/src/main/res/layout/cart_item.xml
index 23ab527..06d0968 100644
--- a/app/src/main/res/layout/card_item.xml
+++ b/app/src/main/res/layout/cart_item.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="105.dp"
-    android:id="@+id/cardItem"
+    android:id="@+id/cartItem"
 >
 
     <ImageView
@@ -12,8 +12,8 @@
         android:layout_width="80.dp"
         android:layout_height="80.dp"
         android:layout_marginStart="6dp"
-        android:contentDescription="@string/card_image"
-        android:src="@drawable/card_image"
+        android:contentDescription="@string/cart_image"
+        android:src="@drawable/cart_image"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -53,7 +53,7 @@
     </LinearLayout>
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -68,7 +68,7 @@
         android:paddingStart="6.dp"
         android:paddingEnd="6.dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/textView"
+        app:layout_constraintEnd_toEndOf="@+id/price"
         app:layout_constraintStart_toStartOf="@+id/imageView" />
 
 
diff --git a/app/src/main/res/layout/card_recycler_view.xml b/app/src/main/res/layout/cart_recycler_view.xml
similarity index 58%
rename from app/src/main/res/layout/card_recycler_view.xml
rename to app/src/main/res/layout/cart_recycler_view.xml
index 4302ca4..1793037 100644
--- a/app/src/main/res/layout/card_recycler_view.xml
+++ b/app/src/main/res/layout/cart_recycler_view.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cartRW"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
+    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     >
 
 </androidx.recyclerview.widget.RecyclerView>
\ 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 fee6681..39510c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,10 @@
     <string name="date">Date</string>
     <string name="notes">Notes</string>
     <string name="buttonSave">Save</string>
-    <string name="card_image">card image</string>
+    <string name="cart_image">cart image</string>
     <string name="list_item_number">List item 1</string>
     <string name="price">$35</string>
+    <string name="open_cart">open cart</string>
+    <string name="show_sign_in_dialog">show sign in dialog</string>
+    <string name="open_contacts">open contacts</string>
 </resources>
\ No newline at end of file

From 69c582c46853e78254658a1086d4eb59a2bab075 Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Sat, 11 Jan 2025 12:30:26 +0300
Subject: [PATCH 08/13] add Cart view

---
 .../homework/viewandresources/CartActivity.kt |  2 +-
 app/src/main/res/layout/activity_cart.xml     | 28 +++++-
 app/src/main/res/layout/cart_price_block.xml  | 96 +++++++++++++++++++
 .../main/res/layout/cart_recycler_view.xml    | 11 ---
 app/src/main/res/values/strings.xml           | 10 ++
 5 files changed, 133 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/layout/cart_price_block.xml
 delete mode 100644 app/src/main/res/layout/cart_recycler_view.xml

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 3e9a209..b981957 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
@@ -30,7 +30,7 @@ class CartActivity : AppCompatActivity() {
 
     private fun createCarts(): List<CartData> {
 
-        val carts = (1..4).map {
+        val carts = (1..15).map {
             CartData(
                 headerTitle = "List item $it",
                 image = R.drawable.cart_image,
diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml
index 63bfab6..e9a4bda 100644
--- a/app/src/main/res/layout/activity_cart.xml
+++ b/app/src/main/res/layout/activity_cart.xml
@@ -9,7 +9,7 @@
     <include layout="@layout/main_toolbar" />
 
     <LinearLayout
-        android:id="@+id/personLayout"
+        android:id="@+id/cartLayout"
         android:layout_width="match_parent"
         android:layout_height="0.dp"
         android:layout_margin="10.dp"
@@ -21,8 +21,32 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/topAppBar">
 
-        <include layout="@layout/cart_recycler_view" />
+        <TextView
+            android:id="@+id/cartCounter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/items_in_your_cart" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/cartRW"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+        <include layout="@layout/cart_price_block" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/priceOrderButton"
+            android:layout_width="139.dp"
+            android:layout_height="40.dp"
+            android:layout_gravity="center"
+            android:text="@string/price_order" />
 
     </LinearLayout>
 
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/cart_price_block.xml b/app/src/main/res/layout/cart_price_block.xml
new file mode 100644
index 0000000..24164d3
--- /dev/null
+++ b/app/src/main/res/layout/cart_price_block.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/cartPriceBlock"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/orderTotalLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/orderTotalText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/order_total" />
+
+        <TextView
+            android:id="@+id/orderPrice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="@string/_175_50" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/subtotalLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/subtotalText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/subtotal" />
+
+        <TextView
+            android:id="@+id/subtotalPrice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="@string/_140" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/shippingLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/shippingText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/shipping" />
+
+        <TextView
+            android:id="@+id/shippingPrice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="@string/_25" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/taxLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/taxText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/tax" />
+
+        <TextView
+            android:id="@+id/taxPrice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="@string/_10_50" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/cart_recycler_view.xml b/app/src/main/res/layout/cart_recycler_view.xml
deleted file mode 100644
index 1793037..0000000
--- a/app/src/main/res/layout/cart_recycler_view.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/cartRW"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-    >
-
-</androidx.recyclerview.widget.RecyclerView>
\ 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 39510c1..214e977 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,4 +21,14 @@
     <string name="open_cart">open cart</string>
     <string name="show_sign_in_dialog">show sign in dialog</string>
     <string name="open_contacts">open contacts</string>
+    <string name="items_in_your_cart">4 items in your cart</string>
+    <string name="subtotal">Subtotal:</string>
+    <string name="_140">$140</string>
+    <string name="shipping">Shipping:</string>
+    <string name="_25">$25</string>
+    <string name="tax">Tax:</string>
+    <string name="_10_50">$10.50</string>
+    <string name="order_total">Order Total:</string>
+    <string name="_175_50">$175.50</string>
+    <string name="price_order">Price order</string>
 </resources>
\ No newline at end of file

From 7f91f2cb1d47471aa4812251290d1a512dff5bab Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Sat, 11 Jan 2025 21:49:25 +0300
Subject: [PATCH 09/13] fix size and color cart

---
 app/src/main/res/drawable/mood.xml           | 10 ++++++
 app/src/main/res/layout/activity_cart.xml    | 13 ++++++--
 app/src/main/res/layout/cart_item.xml        |  9 ++++--
 app/src/main/res/layout/cart_price_block.xml | 34 ++++++++++++++++++--
 app/src/main/res/values/colors.xml           |  1 +
 app/src/main/res/values/strings.xml          |  1 +
 6 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/mood.xml

diff --git a/app/src/main/res/drawable/mood.xml b/app/src/main/res/drawable/mood.xml
new file mode 100644
index 0000000..6ca55a5
--- /dev/null
+++ b/app/src/main/res/drawable/mood.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="15dp"
+    android:height="16dp"
+    android:tint="?attr/colorPrimary"
+    android:viewportWidth="15"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M10.125,7.25C10.438,7.25 10.703,7.141 10.922,6.922C11.141,6.703 11.25,6.438 11.25,6.125C11.25,5.813 11.141,5.547 10.922,5.328C10.703,5.109 10.438,5 10.125,5C9.813,5 9.547,5.109 9.328,5.328C9.109,5.547 9,5.813 9,6.125C9,6.438 9.109,6.703 9.328,6.922C9.547,7.141 9.813,7.25 10.125,7.25ZM4.875,7.25C5.188,7.25 5.453,7.141 5.672,6.922C5.891,6.703 6,6.438 6,6.125C6,5.813 5.891,5.547 5.672,5.328C5.453,5.109 5.188,5 4.875,5C4.563,5 4.297,5.109 4.078,5.328C3.859,5.547 3.75,5.813 3.75,6.125C3.75,6.438 3.859,6.703 4.078,6.922C4.297,7.141 4.563,7.25 4.875,7.25ZM7.5,12.125C8.35,12.125 9.122,11.884 9.816,11.403C10.509,10.922 11.012,10.288 11.325,9.5H3.675C3.987,10.288 4.491,10.922 5.184,11.403C5.878,11.884 6.65,12.125 7.5,12.125ZM7.5,15.5C6.463,15.5 5.488,15.303 4.575,14.909C3.662,14.516 2.869,13.981 2.194,13.306C1.519,12.631 0.984,11.837 0.591,10.925C0.197,10.012 0,9.038 0,8C0,6.963 0.197,5.988 0.591,5.075C0.984,4.162 1.519,3.369 2.194,2.694C2.869,2.019 3.662,1.484 4.575,1.091C5.488,0.697 6.463,0.5 7.5,0.5C8.538,0.5 9.512,0.697 10.425,1.091C11.337,1.484 12.131,2.019 12.806,2.694C13.481,3.369 14.016,4.162 14.409,5.075C14.803,5.988 15,6.963 15,8C15,9.038 14.803,10.012 14.409,10.925C14.016,11.837 13.481,12.631 12.806,13.306C12.131,13.981 11.337,14.516 10.425,14.909C9.512,15.303 8.538,15.5 7.5,15.5ZM7.5,14C9.175,14 10.594,13.419 11.756,12.256C12.919,11.094 13.5,9.675 13.5,8C13.5,6.325 12.919,4.906 11.756,3.744C10.594,2.581 9.175,2 7.5,2C5.825,2 4.406,2.581 3.244,3.744C2.081,4.906 1.5,6.325 1.5,8C1.5,9.675 2.081,11.094 3.244,12.256C4.406,13.419 5.825,14 7.5,14Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml
index e9a4bda..6ad06f1 100644
--- a/app/src/main/res/layout/activity_cart.xml
+++ b/app/src/main/res/layout/activity_cart.xml
@@ -25,6 +25,8 @@
             android:id="@+id/cartCounter"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:paddingBottom="10dp"
             android:text="@string/items_in_your_cart" />
 
         <androidx.recyclerview.widget.RecyclerView
@@ -41,9 +43,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/priceOrderButton"
-            android:layout_width="139.dp"
-            android:layout_height="40.dp"
+            android:contentDescription="@string/mood"
+            app:icon="@drawable/mood"
+            app:iconGravity="textStart"
+            app:iconSize="16dp"
+            app:iconPadding="8dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:fontFamily="sans-serif-medium"
+            android:textSize="14sp"
             android:text="@string/price_order" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/cart_item.xml b/app/src/main/res/layout/cart_item.xml
index 06d0968..5d18767 100644
--- a/app/src/main/res/layout/cart_item.xml
+++ b/app/src/main/res/layout/cart_item.xml
@@ -33,6 +33,7 @@
             android:id="@+id/header_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textSize="22sp"
             android:text="@string/list_item_number"
             tools:ignore="MissingConstraints" />
 
@@ -40,6 +41,7 @@
             android:id="@+id/category"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textSize="14sp"
             android:text="@string/list_item_number"
             tools:ignore="MissingConstraints" />
 
@@ -47,6 +49,7 @@
             android:id="@+id/supporting"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textSize="14sp"
             android:text="@string/list_item_number"
             tools:ignore="MissingConstraints" />
 
@@ -58,11 +61,13 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:text="@string/price"
-        app:layout_constraintStart_toEndOf="@+id/linearLayout"
+        android:textColor="?attr/colorTertiary"
+        android:textSize="22sp"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/linearLayout" />
 
     <View
-        android:layout_width="0.dp"
+        android:layout_width="match_parent"
         android:layout_height="2.dp"
         android:background="@android:color/darker_gray"
         android:paddingStart="6.dp"
diff --git a/app/src/main/res/layout/cart_price_block.xml b/app/src/main/res/layout/cart_price_block.xml
index 24164d3..6e7a053 100644
--- a/app/src/main/res/layout/cart_price_block.xml
+++ b/app/src/main/res/layout/cart_price_block.xml
@@ -9,6 +9,8 @@
         android:id="@+id/orderTotalLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
         android:orientation="horizontal">
 
         <TextView
@@ -16,14 +18,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/order_total" />
+            android:fontFamily="sans-serif"
+            android:text="@string/order_total"
+            android:textSize="22sp" />
 
         <TextView
             android:id="@+id/orderPrice"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="0"
-            android:text="@string/_175_50" />
+            android:text="@string/_175_50"
+            android:textColor="?attr/colorTertiary"
+            android:textSize="22sp" />
 
     </LinearLayout>
 
@@ -31,6 +37,8 @@
         android:id="@+id/subtotalLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
         android:orientation="horizontal">
 
         <TextView
@@ -38,12 +46,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/subtotal" />
+            android:fontFamily="sans-serif-medium"
+            android:textSize="16sp"
+            android:text="@string/subtotal"
+            />
 
         <TextView
             android:id="@+id/subtotalPrice"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-medium"
+            android:textSize="16sp"
+            android:textColor="?attr/colorTertiary"
             android:layout_weight="0"
             android:text="@string/_140" />
 
@@ -53,12 +67,16 @@
         android:id="@+id/shippingLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
         android:orientation="horizontal">
 
         <TextView
             android:id="@+id/shippingText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-medium"
+            android:textSize="16sp"
             android:layout_weight="1"
             android:text="@string/shipping" />
 
@@ -66,6 +84,9 @@
             android:id="@+id/shippingPrice"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-medium"
+            android:textSize="16sp"
+            android:textColor="?attr/colorTertiary"
             android:layout_weight="0"
             android:text="@string/_25" />
 
@@ -75,12 +96,16 @@
         android:id="@+id/taxLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
         android:orientation="horizontal">
 
         <TextView
             android:id="@+id/taxText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-medium"
+            android:textSize="16sp"
             android:layout_weight="1"
             android:text="@string/tax" />
 
@@ -88,6 +113,9 @@
             android:id="@+id/taxPrice"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-medium"
+            android:textSize="16sp"
+            android:textColor="?attr/colorTertiary"
             android:layout_weight="0"
             android:text="@string/_10_50" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c50e23e..cfd83c9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="purple_200">#FFBB86FC</color>
+    <color name="price_light_purple">#FFDBBCE1</color>
     <color name="purple_500">#FF6200EE</color>
     <color name="purple_700">#FF3700B3</color>
     <color name="teal_200">#FF03DAC5</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 214e977..4cb4006 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,4 +31,5 @@
     <string name="order_total">Order Total:</string>
     <string name="_175_50">$175.50</string>
     <string name="price_order">Price order</string>
+    <string name="mood">mood</string>
 </resources>
\ No newline at end of file

From 10c91fa2d421fe3f992bf7df5c16005368594a88 Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Sat, 11 Jan 2025 23:07:16 +0300
Subject: [PATCH 10/13] add MaterialAlertDialog

---
 app/src/main/res/drawable/sun.xml         | 10 +++
 app/src/main/res/layout/dialog_signin.xml | 94 ++++++++++++++++++++++-
 app/src/main/res/values/strings.xml       |  4 +
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/sun.xml

diff --git a/app/src/main/res/drawable/sun.xml b/app/src/main/res/drawable/sun.xml
new file mode 100644
index 0000000..df4fde7
--- /dev/null
+++ b/app/src/main/res/drawable/sun.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:tint="?attr/colorOnBackground"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M11,14C11.833,14 12.542,13.708 13.125,13.125C13.708,12.542 14,11.833 14,11C14,10.167 13.708,9.458 13.125,8.875C12.542,8.292 11.833,8 11,8C10.167,8 9.458,8.292 8.875,8.875C8.292,9.458 8,10.167 8,11C8,11.833 8.292,12.542 8.875,13.125C9.458,13.708 10.167,14 11,14ZM11,16C9.617,16 8.438,15.512 7.463,14.538C6.488,13.563 6,12.383 6,11C6,9.617 6.488,8.438 7.463,7.463C8.438,6.488 9.617,6 11,6C12.383,6 13.563,6.488 14.538,7.463C15.512,8.438 16,9.617 16,11C16,12.383 15.512,13.563 14.538,14.538C13.563,15.512 12.383,16 11,16ZM4,12H0V10H4V12ZM22,12H18V10H22V12ZM10,4V0H12V4H10ZM10,22V18H12V22H10ZM5.4,6.75L2.875,4.325L4.3,2.85L6.7,5.35L5.4,6.75ZM17.7,19.15L15.275,16.625L16.6,15.25L19.125,17.675L17.7,19.15ZM15.25,5.4L17.675,2.875L19.15,4.3L16.65,6.7L15.25,5.4ZM2.85,17.7L5.375,15.275L6.75,16.6L4.325,19.125L2.85,17.7Z"
+      android:fillColor="#43474E"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_signin.xml b/app/src/main/res/layout/dialog_signin.xml
index 63d12a4..c87c61f 100644
--- a/app/src/main/res/layout/dialog_signin.xml
+++ b/app/src/main/res/layout/dialog_signin.xml
@@ -1,7 +1,99 @@
 <?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:layout_height="match_parent"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp">
 
+    <TextView
+        android:id="@+id/header_login"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="16dp"
+        android:text="@string/login"
+        android:textSize="24sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textFieldLogin"
+        style="?attr/textInputFilledDenseStyle"
+        android:layout_width="match_parent"
+        android:layout_height="56.dp"
+        android:layout_margin="16dp"
+        android:hint="@string/login"
+
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/header_login"
+        tools:ignore="MissingConstraints">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textFieldPassword"
+        style="?attr/textInputFilledDenseStyle"
+        android:layout_width="match_parent"
+        android:layout_height="56.dp"
+        android:layout_margin="16dp"
+        android:hint="@string/password"
+        app:endIconDrawable="@drawable/sun"
+        app:endIconMode="custom"
+
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textFieldLogin"
+        tools:ignore="MissingConstraints">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/resetPassword"
+        style="@style/Widget.Material3.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif-medium"
+        android:text="@string/reset_my_password"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="@+id/textFieldPassword"
+        app:layout_constraintTop_toBottomOf="@+id/textFieldPassword" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/cancelButton"
+        style="@style/Widget.Material3.Button.OutlinedButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif-medium"
+        android:text="@string/cancel"
+        android:textColor="?attr/colorControlNormal"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="@+id/resetPassword"
+        app:layout_constraintTop_toBottomOf="@+id/resetPassword" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/loginButton"
+        style="@style/Widget.Material3.Button.OutlinedButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="12dp"
+        android:fontFamily="sans-serif-medium"
+        android:text="@string/login"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toStartOf="@+id/cancelButton"
+        app:layout_constraintTop_toTopOf="@+id/cancelButton" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 4cb4006..3a4b9a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,4 +32,8 @@
     <string name="_175_50">$175.50</string>
     <string name="price_order">Price order</string>
     <string name="mood">mood</string>
+    <string name="login">Login</string>
+    <string name="password">Password</string>
+    <string name="reset_my_password">Reset my password</string>
+    <string name="cancel">Cancel</string>
 </resources>
\ No newline at end of file

From e0af13319f1c4a5288dca9c3f803d211a1d1e1f4 Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Sat, 11 Jan 2025 23:57:17 +0300
Subject: [PATCH 11/13] fix MaterialAlertDialog

---
 .../homework/viewandresources/MainActivity.kt | 27 +++++++++++++++++++
 app/src/main/res/layout/dialog_signin.xml     | 11 +++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

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..49f450e 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/MainActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/MainActivity.kt
@@ -2,9 +2,12 @@ package otus.gpb.homework.viewandresources
 
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textfield.TextInputEditText
+
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -23,5 +26,29 @@ class MainActivity : AppCompatActivity() {
                 .setView(R.layout.dialog_signin)
                 .show()
         }
+
+//        var textInputEditPassword= findViewById<TextInputEditText>(R.id.editTextPassword)
+
+//        textInputEditTextPassword.transformationMethod = object : PasswordTransformationMethod() {
+//            override fun getTransformation(
+//                source: CharSequence?,
+//                view: View?
+//            ): CharSequence {
+//                return PasswordCharSequence(super.getTransformation(source, view))
+//            }
+//
+//            inner class PasswordCharSequence(private val source: CharSequence) : CharSequence {
+//                override val length: Int get() = source.length
+//
+//                override fun get(index: Int): Char {
+//                    //Only modify char '\u2022' if you want to keep the default behaviour
+//                    return if(source[index] == '\u2022') '*' else source[index]
+//                }
+//
+//                override fun subSequence(startIndex: Int, endIndex: Int): CharSequence {
+//                    return source.subSequence(startIndex, endIndex)
+//                }
+//            }
+//        }
     }
 }
\ 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 c87c61f..ccaa443 100644
--- a/app/src/main/res/layout/dialog_signin.xml
+++ b/app/src/main/res/layout/dialog_signin.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialog"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -46,18 +47,20 @@
         android:layout_height="56.dp"
         android:layout_margin="16dp"
         android:hint="@string/password"
-        app:endIconDrawable="@drawable/sun"
-        app:endIconMode="custom"
-
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textFieldLogin"
+        app:passwordToggleDrawable="@drawable/sun"
+        app:passwordToggleEnabled="true"
         tools:ignore="MissingConstraints">
 
         <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/editTextPassword"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            />
 
     </com.google.android.material.textfield.TextInputLayout>
 

From 7ddfd150df4f1415e95caa97797167d7a30dcec6 Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Sun, 12 Jan 2025 09:32:06 +0300
Subject: [PATCH 12/13] fix position MaterialAlertDialog

---
 .../homework/viewandresources/MainActivity.kt | 26 -------------------
 app/src/main/res/layout/dialog_signin.xml     |  8 +++---
 2 files changed, 5 insertions(+), 29 deletions(-)

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 49f450e..38bf0ff 100644
--- a/app/src/main/java/otus/gpb/homework/viewandresources/MainActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/viewandresources/MainActivity.kt
@@ -2,11 +2,9 @@ package otus.gpb.homework.viewandresources
 
 import android.content.Intent
 import android.os.Bundle
-import android.view.View
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.textfield.TextInputEditText
 
 
 class MainActivity : AppCompatActivity() {
@@ -26,29 +24,5 @@ class MainActivity : AppCompatActivity() {
                 .setView(R.layout.dialog_signin)
                 .show()
         }
-
-//        var textInputEditPassword= findViewById<TextInputEditText>(R.id.editTextPassword)
-
-//        textInputEditTextPassword.transformationMethod = object : PasswordTransformationMethod() {
-//            override fun getTransformation(
-//                source: CharSequence?,
-//                view: View?
-//            ): CharSequence {
-//                return PasswordCharSequence(super.getTransformation(source, view))
-//            }
-//
-//            inner class PasswordCharSequence(private val source: CharSequence) : CharSequence {
-//                override val length: Int get() = source.length
-//
-//                override fun get(index: Int): Char {
-//                    //Only modify char '\u2022' if you want to keep the default behaviour
-//                    return if(source[index] == '\u2022') '*' else source[index]
-//                }
-//
-//                override fun subSequence(startIndex: Int, endIndex: Int): CharSequence {
-//                    return source.subSequence(startIndex, endIndex)
-//                }
-//            }
-//        }
     }
 }
\ 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 ccaa443..c99b256 100644
--- a/app/src/main/res/layout/dialog_signin.xml
+++ b/app/src/main/res/layout/dialog_signin.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialog"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/dialog"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingTop="16dp"
@@ -59,8 +59,7 @@
             android:id="@+id/editTextPassword"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            />
+            android:inputType="textPassword" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -69,6 +68,8 @@
         style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
         android:fontFamily="sans-serif-medium"
         android:text="@string/reset_my_password"
         android:textSize="14sp"
@@ -80,6 +81,7 @@
         style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
         android:fontFamily="sans-serif-medium"
         android:text="@string/cancel"
         android:textColor="?attr/colorControlNormal"

From 735d87a73ba90b0868e20073e4c60aee43134626 Mon Sep 17 00:00:00 2001
From: SpiritualAdviser <pomaxam@narod.ru>
Date: Sun, 12 Jan 2025 09:37:43 +0300
Subject: [PATCH 13/13] fix position cart

---
 app/src/main/res/layout/activity_cart.xml | 2 +-
 app/src/main/res/layout/cart_item.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml
index 6ad06f1..20a6b4f 100644
--- a/app/src/main/res/layout/activity_cart.xml
+++ b/app/src/main/res/layout/activity_cart.xml
@@ -12,7 +12,7 @@
         android:id="@+id/cartLayout"
         android:layout_width="match_parent"
         android:layout_height="0.dp"
-        android:layout_margin="10.dp"
+        android:layout_margin="16.dp"
         android:orientation="vertical"
 
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/cart_item.xml b/app/src/main/res/layout/cart_item.xml
index 5d18767..2ac9469 100644
--- a/app/src/main/res/layout/cart_item.xml
+++ b/app/src/main/res/layout/cart_item.xml
@@ -59,7 +59,7 @@
         android:id="@+id/price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginEnd="8dp"
         android:text="@string/price"
         android:textColor="?attr/colorTertiary"
         android:textSize="22sp"