diff --git a/app/build.gradle b/app/build.gradle index 4332a31..b46bca6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - compileSdk 32 + compileSdk 34 defaultConfig { applicationId "otus.gpb.homework.viewandresources" @@ -29,11 +29,11 @@ android { kotlinOptions { jvmTarget = '1.8' } + namespace 'otus.gpb.homework.viewandresources' } - dependencies { implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 608e135..061bd69 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> + + \ No newline at end of file diff --git a/app/src/main/res/drawable/account.xml b/app/src/main/res/drawable/account.xml new file mode 100644 index 0000000..c5e3a41 --- /dev/null +++ b/app/src/main/res/drawable/account.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/alarm_clock.jpeg b/app/src/main/res/drawable/alarm_clock.jpeg new file mode 100644 index 0000000..5f0aeff Binary files /dev/null and b/app/src/main/res/drawable/alarm_clock.jpeg differ diff --git a/app/src/main/res/drawable/arrow_left.xml b/app/src/main/res/drawable/arrow_left.xml new file mode 100644 index 0000000..c6c34d6 --- /dev/null +++ b/app/src/main/res/drawable/arrow_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/baseline_search_24.xml b/app/src/main/res/drawable/baseline_search_24.xml new file mode 100644 index 0000000..4239c91 --- /dev/null +++ b/app/src/main/res/drawable/baseline_search_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/cactus.jpeg b/app/src/main/res/drawable/cactus.jpeg new file mode 100644 index 0000000..258b897 Binary files /dev/null and b/app/src/main/res/drawable/cactus.jpeg differ diff --git a/app/src/main/res/drawable/cake.jpeg b/app/src/main/res/drawable/cake.jpeg new file mode 100644 index 0000000..e122725 Binary files /dev/null and b/app/src/main/res/drawable/cake.jpeg differ diff --git a/app/src/main/res/drawable/calendar.xml b/app/src/main/res/drawable/calendar.xml new file mode 100644 index 0000000..777c8cc --- /dev/null +++ b/app/src/main/res/drawable/calendar.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_baseline_location_on_24.xml b/app/src/main/res/drawable/ic_baseline_location_on_24.xml new file mode 100644 index 0000000..7eb4ae9 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_location_on_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_edit_24.xml b/app/src/main/res/drawable/ic_edit_24.xml new file mode 100644 index 0000000..3c53db7 --- /dev/null +++ b/app/src/main/res/drawable/ic_edit_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_phone_24.xml b/app/src/main/res/drawable/ic_phone_24.xml new file mode 100644 index 0000000..4f815cd --- /dev/null +++ b/app/src/main/res/drawable/ic_phone_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_wallet_24.xml b/app/src/main/res/drawable/ic_wallet_24.xml new file mode 100644 index 0000000..83e9d26 --- /dev/null +++ b/app/src/main/res/drawable/ic_wallet_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/icon_cross.xml b/app/src/main/res/drawable/icon_cross.xml new file mode 100644 index 0000000..954d518 --- /dev/null +++ b/app/src/main/res/drawable/icon_cross.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/love_tag_svgrepo_com.xml b/app/src/main/res/drawable/love_tag_svgrepo_com.xml new file mode 100644 index 0000000..ed7eb0c --- /dev/null +++ b/app/src/main/res/drawable/love_tag_svgrepo_com.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/menu_down.xml b/app/src/main/res/drawable/menu_down.xml new file mode 100644 index 0000000..22bfc56 --- /dev/null +++ b/app/src/main/res/drawable/menu_down.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/plates.jpeg b/app/src/main/res/drawable/plates.jpeg new file mode 100644 index 0000000..1408c05 Binary files /dev/null and b/app/src/main/res/drawable/plates.jpeg differ 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_family.xml b/app/src/main/res/font/roboto_family.xml new file mode 100644 index 0000000..bc16d05 --- /dev/null +++ b/app/src/main/res/font/roboto_family.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file 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/font/roboto_thin.xml b/app/src/main/res/font/roboto_thin.xml new file mode 100644 index 0000000..7acfbd3 --- /dev/null +++ b/app/src/main/res/font/roboto_thin.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..6e13f9f 100644 --- a/app/src/main/res/layout/activity_cart.xml +++ b/app/src/main/res/layout/activity_cart.xml @@ -4,6 +4,393 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/backColor" tools:context=".CartActivity"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +