diff --git a/app/build.gradle b/app/build.gradle
index 4332a31..971038a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,12 +4,12 @@ plugins {
}
android {
- compileSdk 32
+ compileSdk 33
defaultConfig {
applicationId "otus.gpb.homework.viewandresources"
- minSdk 23
- targetSdk 32
+ minSdk 26
+ targetSdk 33
versionCode 1
versionName "1.0"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 608e135..daa8228 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,10 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/blur_darkred.xml b/app/src/main/res/drawable-v24/blur_darkred.xml
new file mode 100644
index 0000000..68bdc5a
--- /dev/null
+++ b/app/src/main/res/drawable-v24/blur_darkred.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable-v24/blur_red.xml b/app/src/main/res/drawable-v24/blur_red.xml
new file mode 100644
index 0000000..136f826
--- /dev/null
+++ b/app/src/main/res/drawable-v24/blur_red.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable-v24/blur_yellow.xml b/app/src/main/res/drawable-v24/blur_yellow.xml
new file mode 100644
index 0000000..2153632
--- /dev/null
+++ b/app/src/main/res/drawable-v24/blur_yellow.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/arrow_back.xml b/app/src/main/res/drawable/arrow_back.xml
new file mode 100644
index 0000000..31e7df2
--- /dev/null
+++ b/app/src/main/res/drawable/arrow_back.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/blur_blue.xml b/app/src/main/res/drawable/blur_blue.xml
new file mode 100644
index 0000000..ffa1fca
--- /dev/null
+++ b/app/src/main/res/drawable/blur_blue.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/call.xml b/app/src/main/res/drawable/call.xml
new file mode 100644
index 0000000..2aba8ad
--- /dev/null
+++ b/app/src/main/res/drawable/call.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/close.xml b/app/src/main/res/drawable/close.xml
new file mode 100644
index 0000000..dc1f369
--- /dev/null
+++ b/app/src/main/res/drawable/close.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/edit.xml b/app/src/main/res/drawable/edit.xml
new file mode 100644
index 0000000..faddfce
--- /dev/null
+++ b/app/src/main/res/drawable/edit.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/insert_invitation.xml b/app/src/main/res/drawable/insert_invitation.xml
new file mode 100644
index 0000000..037fe33
--- /dev/null
+++ b/app/src/main/res/drawable/insert_invitation.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/location.xml b/app/src/main/res/drawable/location.xml
new file mode 100644
index 0000000..e5383d7
--- /dev/null
+++ b/app/src/main/res/drawable/location.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/loyalty.xml b/app/src/main/res/drawable/loyalty.xml
new file mode 100644
index 0000000..a89d963
--- /dev/null
+++ b/app/src/main/res/drawable/loyalty.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/person.xml b/app/src/main/res/drawable/person.xml
new file mode 100644
index 0000000..bd8dc80
--- /dev/null
+++ b/app/src/main/res/drawable/person.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/search.xml b/app/src/main/res/drawable/search.xml
new file mode 100644
index 0000000..4b331b7
--- /dev/null
+++ b/app/src/main/res/drawable/search.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/wallet.xml b/app/src/main/res/drawable/wallet.xml
new file mode 100644
index 0000000..edd53b4
--- /dev/null
+++ b/app/src/main/res/drawable/wallet.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/font/roboto_medium.xml b/app/src/main/res/font/roboto_medium.xml
new file mode 100644
index 0000000..59df90b
--- /dev/null
+++ b/app/src/main/res/font/roboto_medium.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml
index 57dc4d4..ab3229a 100644
--- a/app/src/main/res/layout/activity_cart.xml
+++ b/app/src/main/res/layout/activity_cart.xml
@@ -4,6 +4,108 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="?attr/appBackground"
tools:context=".CartActivity">
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml
index 6ef087b..3030435 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -4,6 +4,170 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="?attr/appBackground"
tools:context=".ContactsActivity">
-
\ 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..f00aec4 100644
--- a/app/src/main/res/layout/dialog_signin.xml
+++ b/app/src/main/res/layout/dialog_signin.xml
@@ -1,6 +1,85 @@
+ android:layout_height="wrap_content"
+ android:background="?attr/appBackground">
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/first_items.xml b/app/src/main/res/layout/first_items.xml
new file mode 100644
index 0000000..1890a7d
--- /dev/null
+++ b/app/src/main/res/layout/first_items.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fourth_items.xml b/app/src/main/res/layout/fourth_items.xml
new file mode 100644
index 0000000..60b0c8a
--- /dev/null
+++ b/app/src/main/res/layout/fourth_items.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/second_items.xml b/app/src/main/res/layout/second_items.xml
new file mode 100644
index 0000000..8cdd942
--- /dev/null
+++ b/app/src/main/res/layout/second_items.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/third_items.xml b/app/src/main/res/layout/third_items.xml
new file mode 100644
index 0000000..5ff2b60
--- /dev/null
+++ b/app/src/main/res/layout/third_items.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/total_items.xml b/app/src/main/res/layout/total_items.xml
new file mode 100644
index 0000000..250e676
--- /dev/null
+++ b/app/src/main/res/layout/total_items.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/menu/cart_toolbar_menu.xml b/app/src/main/res/menu/cart_toolbar_menu.xml
new file mode 100644
index 0000000..ecb654d
--- /dev/null
+++ b/app/src/main/res/menu/cart_toolbar_menu.xml
@@ -0,0 +1,13 @@
+
+
diff --git a/app/src/main/res/menu/contacts_toolbar_menu.xml b/app/src/main/res/menu/contacts_toolbar_menu.xml
new file mode 100644
index 0000000..38532b0
--- /dev/null
+++ b/app/src/main/res/menu/contacts_toolbar_menu.xml
@@ -0,0 +1,13 @@
+
+
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 266a56d..9b54f0b 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
new file mode 100644
index 0000000..fd5c597
--- /dev/null
+++ b/app/src/main/res/values/attr.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..11deee3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,28 @@
#FF018786
#FF000000
#FFFFFFFF
-
\ No newline at end of file
+
+ #FFD76F
+ #F47265
+ #4FB8FF
+ #E74C3C
+
+
+ #FFFFFF
+ #263238
+ #2980B9
+ #2ECC71
+ #979797
+ #F0F0F0
+ #E74C3C
+
+
+ #121212
+ #E0E0E0
+ #4FB8FF
+ #89ED5B
+ #888888
+ #272727
+ #FFD76F
+
+
diff --git a/app/src/main/res/values/customStyles.xml b/app/src/main/res/values/customStyles.xml
new file mode 100644
index 0000000..2952fdc
--- /dev/null
+++ b/app/src/main/res/values/customStyles.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml
new file mode 100644
index 0000000..d2226ac
--- /dev/null
+++ b/app/src/main/res/values/font_certs.xml
@@ -0,0 +1,17 @@
+
+
+
+ - @array/com_google_android_gms_fonts_certs_dev
+ - @array/com_google_android_gms_fonts_certs_prod
+
+
+ -
+ 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
+
+
+
diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml
new file mode 100644
index 0000000..3ad41da
--- /dev/null
+++ b/app/src/main/res/values/preloaded_fonts.xml
@@ -0,0 +1,6 @@
+
+
+
+ - @font/roboto_medium
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a7036ac..f859169 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,45 @@
View & Resources
+ Search
+ more
+ Loyalty
+ Name
+ register
+ Phone number
+ Select
+ Address
+ City
+ Zip
+ State
+ Birthday
+ Notes
+ Sign in
+ E-mail
+ Password
+ Reset my password
+ 4 items in your cart
+ image
+ On the top
+ Caption
+ $US, 1.50
+ close
+ $US, 4.50
+ Forever Friends
+ $US, 8.00
+ Prototyping Kit
+
+ $US, 22.00
+ Your order total
+ 41.24
+ Subtotal\nShipping\nTax
+ 36.00\n2.00\n3.50
+ Pay now
+
+
+ - Item 1
+ - Item 2
+ - Item 3
+ - Item 4
+ - Item 5
+
\ 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 d0b5d4b..e4dd97e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
-
-
\ No newline at end of file
+