diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 608e135..1153d26 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,9 @@
+ android:exported="false"
+ android:screenOrientation="portrait"
+ />
+
+
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt b/app/src/main/java/otus/gpb/homework/viewandresources/CartActivity.kt
index b6cbf73..336733d 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,82 @@
package otus.gpb.homework.viewandresources
+import android.content.Context
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import android.widget.ImageView
+import android.widget.ListView
+import android.widget.TextView
+import android.widget.Toast
+import com.google.android.material.appbar.MaterialToolbar
+import com.google.android.material.button.MaterialButton
class CartActivity : AppCompatActivity() {
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+
+ //setTheme(R.style.Theme_MyTheme) // это работает
+
setContentView(R.layout.activity_cart)
+
+ findViewById(R.id.btnClose).setOnClickListener {
+ Toast.makeText(this, "btnClose", Toast.LENGTH_SHORT).show()
+ }
+
+ findViewById(R.id.buttonPlaceOrder).setOnClickListener {
+ Toast.makeText(this, "buttonPlaceOrder", Toast.LENGTH_SHORT).show()
+ }
+
+ findViewById(R.id.topAppBar).setNavigationOnClickListener {
+ finish()
+ }
+
+
+ val listView: ListView = findViewById(R.id.listItems)
+
+ val items = ArrayList()
+ for(i in 1..4) {
+ items.add(ItemData("Item $i", "Category", "Supporting line text lorem ipsum...", "$i$", R.drawable.ic_shape_outline))
+ }
+
+ val listAdapter = ListAdapter(this, items)
+ listView.adapter = listAdapter
}
+}
+
+class ItemData(
+ var name: String,
+ var category: String,
+ var description: String,
+ var price: String,
+ var image: Int
+)
+
+class ListAdapter(context: Context, dataArrayList: ArrayList?) :
+ ArrayAdapter(context, R.layout.list_item, dataArrayList!!) {
+
+ override fun getView(position: Int, view: View?, parent: ViewGroup): View {
+ var view = view
+ val listData = getItem(position)
+ if (view == null) {
+ view = LayoutInflater.from(context).inflate(R.layout.layout_list_item, parent, false)
+ }
+ val listImage = view!!.findViewById(R.id.imageView)
+ val listName = view.findViewById(R.id.textViewName)
+ val listCategory = view.findViewById(R.id.textViewCategory)
+ val listDescription = view.findViewById(R.id.textViewDescription)
+ val listPrice = view.findViewById(R.id.textViewPrice)
+
+ listImage.setImageResource(listData!!.image)
+ listName.text = listData.name
+ listCategory.text = listData.category
+ listDescription.text = listData.description
+ listPrice.text = listData.price
+
+ return view
+ }
}
\ 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 25f1ffb..16fb4b3 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,42 @@ package otus.gpb.homework.viewandresources
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
+import android.widget.ArrayAdapter
+import android.widget.AutoCompleteTextView
+import android.widget.Toast
+import androidx.appcompat.app.ActionBar
+import androidx.core.content.ContentProviderCompat.requireContext
+import com.google.android.material.appbar.MaterialToolbar
+import com.google.android.material.textview.MaterialTextView
+import com.google.android.material.textfield.MaterialAutoCompleteTextView
+import com.google.android.material.textfield.TextInputLayout
class ContactsActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_contacts)
+
+ var textField = findViewById(R.id.dropDownPhoneType)
+ val items = listOf("Mobile", "Stationary")
+ val adapter = ArrayAdapter(this, R.layout.list_item, items)
+ (textField.editText as? AutoCompleteTextView)?.setAdapter(adapter)
+
+ var topAppBar: MaterialToolbar = findViewById(R.id.topAppBar)
+ topAppBar.setNavigationOnClickListener {
+ finish()
+ }
+ topAppBar.setOnMenuItemClickListener { menuItem ->
+ when (menuItem.itemId) {
+ R.id.attach -> {
+ Toast.makeText(this, "Attach", Toast.LENGTH_SHORT).show()
+ true
+ }
+ R.id.more -> {
+ Toast.makeText(this, "More", Toast.LENGTH_SHORT).show()
+ true
+ }
+ else -> false
+ }
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat.jpeg b/app/src/main/res/drawable/cat.jpeg
new file mode 100644
index 0000000..3d7f8c7
Binary files /dev/null and b/app/src/main/res/drawable/cat.jpeg differ
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
new file mode 100644
index 0000000..a3cbd5f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_account.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_left.xml b/app/src/main/res/drawable/ic_arrow_left.xml
new file mode 100644
index 0000000..828f7a8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_left.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_bookmark_outline.xml b/app/src/main/res/drawable/ic_bookmark_outline.xml
new file mode 100644
index 0000000..057a729
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bookmark_outline.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_calendar_badge.xml b/app/src/main/res/drawable/ic_calendar_badge.xml
new file mode 100644
index 0000000..ba8390f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calendar_badge.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cellphone_check.xml b/app/src/main/res/drawable/ic_cellphone_check.xml
new file mode 100644
index 0000000..3a71709
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cellphone_check.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_close_circle.xml b/app/src/main/res/drawable/ic_close_circle.xml
new file mode 100644
index 0000000..4ec46d5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close_circle.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_dots_vertical.xml b/app/src/main/res/drawable/ic_dots_vertical.xml
new file mode 100644
index 0000000..f2be274
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dots_vertical.xml
@@ -0,0 +1,13 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_emoticon.xml b/app/src/main/res/drawable/ic_emoticon.xml
new file mode 100644
index 0000000..49ce120
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoticon.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_eye_outline.xml b/app/src/main/res/drawable/ic_eye_outline.xml
new file mode 100644
index 0000000..de25261
--- /dev/null
+++ b/app/src/main/res/drawable/ic_eye_outline.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_menu_down.xml b/app/src/main/res/drawable/ic_menu_down.xml
new file mode 100644
index 0000000..0fb0589
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_down.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_microphone.xml b/app/src/main/res/drawable/ic_microphone.xml
new file mode 100644
index 0000000..ed375ff
--- /dev/null
+++ b/app/src/main/res/drawable/ic_microphone.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_paperclip.xml b/app/src/main/res/drawable/ic_paperclip.xml
new file mode 100644
index 0000000..f0884c7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_paperclip.xml
@@ -0,0 +1,14 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shape_outline.xml b/app/src/main/res/drawable/ic_shape_outline.xml
new file mode 100644
index 0000000..a141085
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shape_outline.xml
@@ -0,0 +1,13 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/font/roboto.xml b/app/src/main/res/font/roboto.xml
new file mode 100644
index 0000000..2641caf
--- /dev/null
+++ b/app/src/main/res/font/roboto.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/app/src/main/res/font/roboto_light.xml b/app/src/main/res/font/roboto_light.xml
new file mode 100644
index 0000000..28fbc0d
--- /dev/null
+++ b/app/src/main/res/font/roboto_light.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..2fe9c40 100644
--- a/app/src/main/res/layout/activity_cart.xml
+++ b/app/src/main/res/layout/activity_cart.xml
@@ -4,6 +4,197 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".CartActivity">
+ android:orientation="vertical"
+ tools:context=".CartActivity"
+ android:padding="10dp"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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..2b604f7 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -4,6 +4,227 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".ContactsActivity">
+ tools:context=".ContactsActivity"
+ android:orientation="vertical"
+ android:padding="10dp">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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..efc2483 100644
--- a/app/src/main/res/layout/dialog_signin.xml
+++ b/app/src/main/res/layout/dialog_signin.xml
@@ -1,6 +1,112 @@
-
+ android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:paddingRight="16dp"
+ android:paddingLeft="16dp"
+ android:orientation="vertical">
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_list_item.xml b/app/src/main/res/layout/layout_list_item.xml
new file mode 100644
index 0000000..d5731f1
--- /dev/null
+++ b/app/src/main/res/layout/layout_list_item.xml
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml
new file mode 100644
index 0000000..e63e167
--- /dev/null
+++ b/app/src/main/res/layout/list_item.xml
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/top_app_bar.xml b/app/src/main/res/menu/top_app_bar.xml
new file mode 100644
index 0000000..b568053
--- /dev/null
+++ b/app/src/main/res/menu/top_app_bar.xml
@@ -0,0 +1,21 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..ba235db
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,8 @@
+
+
+ #A7C8FF
+ @color/black
+ #E1E2E9
+ #04305F
+ #DBBCE1
+
\ 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..083e5a0 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -2,6 +2,6 @@
\ No newline at end of file
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
new file mode 100644
index 0000000..a218009
--- /dev/null
+++ b/app/src/main/res/values/array.xml
@@ -0,0 +1,7 @@
+
+
+
+ - Mobile
+ - Stationary
+
+
\ 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..8b56fcd 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,10 @@
#FF018786
#FF000000
#FFFFFFFF
+
+ #3E5F90
+ #F9F9FF
+ #191C20
+ #FFFFFF
+ #6E5676
\ No newline at end of file
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
+
+
+ -
+ MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
+
+
+
+ -
+ MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
+
+
+
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..9c99c80
--- /dev/null
+++ b/app/src/main/res/values/preloaded_fonts.xml
@@ -0,0 +1,7 @@
+
+
+
+ - @font/roboto
+ - @font/roboto_light
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a7036ac..c2dae87 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,34 @@
View & Resources
+ Name
+ Ivan Petrov
+ Phone
+ +1(234)567-8900
+ Mobile
+ Select
+ Save
+ Address
+ Tokyo
+ Date
+ Notes
+ Loves burgers and french fries
+ Address
+ 123, Lenin street, Apt.6
+ City
+ Country
+ Japan
+ Birthday
+ Cart
+ 4 items in your cart
+ Place order
+ Subtotal:
+ Order Total:
+ Shipping:
+ Tax:
+ Login
+ Password
+ Reset my password
+ Cancel
+
+
\ 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..4bf8195 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,8 +2,35 @@
-
+
+
+
+
+
\ No newline at end of file