diff --git a/app/build.gradle b/app/build.gradle index 4332a31..92ed40c 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 + targetSdk 33 versionCode 1 versionName "1.0" @@ -34,6 +34,7 @@ android { dependencies { implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.5.1' +// implementation 'androidx.compose.material:material-icons-extended:1.6.8' implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' } \ No newline at end of file diff --git a/app/src/main/res/drawable/arrow_back_black_24dp.xml b/app/src/main/res/drawable/arrow_back_black_24dp.xml new file mode 100644 index 0000000..d219b85 --- /dev/null +++ b/app/src/main/res/drawable/arrow_back_black_24dp.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/baseline_calendar_month_24.xml b/app/src/main/res/drawable/baseline_calendar_month_24.xml new file mode 100644 index 0000000..2c6e9b5 --- /dev/null +++ b/app/src/main/res/drawable/baseline_calendar_month_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/baseline_location_on_24.xml b/app/src/main/res/drawable/baseline_location_on_24.xml new file mode 100644 index 0000000..dd12113 --- /dev/null +++ b/app/src/main/res/drawable/baseline_location_on_24.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..b539e79 --- /dev/null +++ b/app/src/main/res/drawable/call.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/close.xml b/app/src/main/res/drawable/close.xml new file mode 100644 index 0000000..512dfdb --- /dev/null +++ b/app/src/main/res/drawable/close.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/dot_line.xml b/app/src/main/res/drawable/dot_line.xml new file mode 100644 index 0000000..2e24c37 --- /dev/null +++ b/app/src/main/res/drawable/dot_line.xml @@ -0,0 +1,8 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/edit.xml b/app/src/main/res/drawable/edit.xml new file mode 100644 index 0000000..931dbdf --- /dev/null +++ b/app/src/main/res/drawable/edit.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/hamburger.xml b/app/src/main/res/drawable/hamburger.xml new file mode 100644 index 0000000..c9c78c8 --- /dev/null +++ b/app/src/main/res/drawable/hamburger.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/loyalty.xml b/app/src/main/res/drawable/loyalty.xml new file mode 100644 index 0000000..30e02d2 --- /dev/null +++ b/app/src/main/res/drawable/loyalty.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/person.xml b/app/src/main/res/drawable/person.xml new file mode 100644 index 0000000..a59515f --- /dev/null +++ b/app/src/main/res/drawable/person.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/search.xml b/app/src/main/res/drawable/search.xml new file mode 100644 index 0000000..d28a601 --- /dev/null +++ b/app/src/main/res/drawable/search.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape.xml b/app/src/main/res/drawable/shape.xml new file mode 100644 index 0000000..51d503a --- /dev/null +++ b/app/src/main/res/drawable/shape.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/wallet.xml b/app/src/main/res/drawable/wallet.xml new file mode 100644 index 0000000..0895837 --- /dev/null +++ b/app/src/main/res/drawable/wallet.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/font/rubik_black.ttf b/app/src/main/res/font/rubik_black.ttf new file mode 100644 index 0000000..edad5d2 Binary files /dev/null and b/app/src/main/res/font/rubik_black.ttf differ diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml index 57dc4d4..af6c14e 100644 --- a/app/src/main/res/layout/activity_cart.xml +++ b/app/src/main/res/layout/activity_cart.xml @@ -6,4 +6,391 @@ android:layout_height="match_parent" tools:context=".CartActivity"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +