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 + + +