diff --git a/app/build.gradle b/app/build.gradle index debcfaf..2d77feb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,6 +34,6 @@ android { dependencies { implementation 'androidx.core:core-ktx:1.15.0' implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'com.google.android.material:material:1.12.0' + implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.constraintlayout:constraintlayout:2.2.0' } \ No newline at end of file diff --git a/app/src/main/res/drawable/cucumber.jpeg b/app/src/main/res/drawable/cucumber.jpeg new file mode 100644 index 0000000..90941d8 Binary files /dev/null and b/app/src/main/res/drawable/cucumber.jpeg differ diff --git a/app/src/main/res/drawable/ic_arrow_back_24.xml b/app/src/main/res/drawable/ic_arrow_back_24.xml new file mode 100644 index 0000000..7fb15d9 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_back_24.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow_drop_down_24.xml b/app/src/main/res/drawable/ic_arrow_drop_down_24.xml new file mode 100644 index 0000000..a77e331 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_drop_down_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_attach_file_24.xml b/app/src/main/res/drawable/ic_attach_file_24.xml new file mode 100644 index 0000000..b017256 --- /dev/null +++ b/app/src/main/res/drawable/ic_attach_file_24.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_bookmark_border_24.xml b/app/src/main/res/drawable/ic_bookmark_border_24.xml new file mode 100644 index 0000000..1a0e9c4 --- /dev/null +++ b/app/src/main/res/drawable/ic_bookmark_border_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_insert_invitation_24.xml b/app/src/main/res/drawable/ic_insert_invitation_24.xml new file mode 100644 index 0000000..30cd3ab --- /dev/null +++ b/app/src/main/res/drawable/ic_insert_invitation_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_keyboard_voice_24.xml b/app/src/main/res/drawable/ic_keyboard_voice_24.xml new file mode 100644 index 0000000..6d4a792 --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard_voice_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_mobile_friendly_24.xml b/app/src/main/res/drawable/ic_mobile_friendly_24.xml new file mode 100644 index 0000000..b72b17f --- /dev/null +++ b/app/src/main/res/drawable/ic_mobile_friendly_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_mood_24.xml b/app/src/main/res/drawable/ic_mood_24.xml new file mode 100644 index 0000000..68b45d3 --- /dev/null +++ b/app/src/main/res/drawable/ic_mood_24.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_more_vert_24.xml b/app/src/main/res/drawable/ic_more_vert_24.xml new file mode 100644 index 0000000..9608ab9 --- /dev/null +++ b/app/src/main/res/drawable/ic_more_vert_24.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_outline_cancel_24.xml b/app/src/main/res/drawable/ic_outline_cancel_24.xml new file mode 100644 index 0000000..477fcef --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_cancel_24.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_outline_wb_sunny_24.xml b/app/src/main/res/drawable/ic_outline_wb_sunny_24.xml new file mode 100644 index 0000000..2dc810a --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_wb_sunny_24.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_perm_identity_24.xml b/app/src/main/res/drawable/ic_perm_identity_24.xml new file mode 100644 index 0000000..83189ff --- /dev/null +++ b/app/src/main/res/drawable/ic_perm_identity_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ketchup.jpeg b/app/src/main/res/drawable/ketchup.jpeg new file mode 100644 index 0000000..f38b5aa Binary files /dev/null and b/app/src/main/res/drawable/ketchup.jpeg differ diff --git a/app/src/main/res/drawable/sausage.png b/app/src/main/res/drawable/sausage.png new file mode 100644 index 0000000..f35cb65 Binary files /dev/null and b/app/src/main/res/drawable/sausage.png differ diff --git a/app/src/main/res/drawable/tomato.jpeg b/app/src/main/res/drawable/tomato.jpeg new file mode 100644 index 0000000..b19cfa2 Binary files /dev/null and b/app/src/main/res/drawable/tomato.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..a454e2e --- /dev/null +++ b/app/src/main/res/font/roboto.xml @@ -0,0 +1,25 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/roboto_bold.xml b/app/src/main/res/font/roboto_bold.xml new file mode 100644 index 0000000..8f51456 --- /dev/null +++ b/app/src/main/res/font/roboto_bold.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/font/roboto_italic.xml b/app/src/main/res/font/roboto_italic.xml new file mode 100644 index 0000000..8f51456 --- /dev/null +++ b/app/src/main/res/font/roboto_italic.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/font/roboto_regular.xml b/app/src/main/res/font/roboto_regular.xml new file mode 100644 index 0000000..8f51456 --- /dev/null +++ b/app/src/main/res/font/roboto_regular.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml index 57dc4d4..5693e1b 100644 --- a/app/src/main/res/layout/activity_cart.xml +++ b/app/src/main/res/layout/activity_cart.xml @@ -6,4 +6,447 @@ android:layout_height="match_parent" 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..86bad7d 100644 --- a/app/src/main/res/layout/activity_contacts.xml +++ b/app/src/main/res/layout/activity_contacts.xml @@ -1,9 +1,203 @@ - - \ 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..23ec719 100644 --- a/app/src/main/res/layout/dialog_signin.xml +++ b/app/src/main/res/layout/dialog_signin.xml @@ -1,6 +1,95 @@ - + android:layout_height="wrap_content"> + + + + + + + + + + + + + + + +