From b6490036f55472577d37c69118ec479b9affac8f Mon Sep 17 00:00:00 2001 From: saraalshater Date: Wed, 1 Dec 2021 12:54:20 +0200 Subject: [PATCH] design1 --- .idea/misc.xml | 34 +++ app/src/main/AndroidManifest.xml | 13 +- .../generated/model/AmplifyModelProvider.java | 2 +- .../datastore/generated/model/Category.java | 6 + .../datastore/generated/model/User.java | 6 + .../main/java/com/example/thrifty/About1.java | 30 ++ .../main/java/com/example/thrifty/About2.java | 25 ++ .../java/com/example/thrifty/Profile.java | 4 +- app/src/main/res/drawable/button1.xml | 23 ++ .../main/res/drawable/edit_text_design.xml | 13 + .../main/res/drawable/edit_text_search.xml | 13 + .../main/res/drawable/edit_text_shadow.xml | 26 ++ app/src/main/res/drawable/envelope_filled.xml | 9 + app/src/main/res/drawable/frame.png | Bin 0 -> 2787 bytes app/src/main/res/drawable/group_5.png | Bin 0 -> 101279 bytes app/src/main/res/drawable/group_8.xml | 12 + .../main/res/drawable/ic_baseline_home_24.xml | 3 +- .../res/drawable/ic_baseline_person_24.xml | 2 +- .../drawable/ic_baseline_shopping_cart_24.xml | 2 +- app/src/main/res/drawable/ic_heart.xml | 9 + .../main/res/drawable/ic_search_regular.xml | 9 + .../drawable/ic_shopping_basket_regular.xml | 9 + app/src/main/res/drawable/ic_store_filled.xml | 4 + .../main/res/drawable/ic_store_regular.xml | 9 + app/src/main/res/drawable/ic_user_regular.xml | 11 + app/src/main/res/drawable/log_out_filled.xml | 9 + app/src/main/res/drawable/logo.png | Bin 0 -> 3969 bytes app/src/main/res/drawable/mask_group.png | Bin 0 -> 54134 bytes app/src/main/res/drawable/money.png | Bin 0 -> 44145 bytes app/src/main/res/drawable/phone_filled.xml | 9 + app/src/main/res/drawable/tab_color.xml | 5 + app/src/main/res/drawable/vector.png | Bin 0 -> 2717 bytes app/src/main/res/font/fonts.xml | 30 ++ app/src/main/res/font/roboto_black.ttf | Bin 0 -> 168060 bytes app/src/main/res/font/roboto_blackitalic.ttf | Bin 0 -> 174108 bytes app/src/main/res/font/roboto_bold.ttf | Bin 0 -> 167336 bytes app/src/main/res/font/roboto_bolditalic.ttf | Bin 0 -> 171508 bytes app/src/main/res/font/roboto_italic.ttf | Bin 0 -> 170504 bytes app/src/main/res/font/roboto_light.ttf | Bin 0 -> 167000 bytes app/src/main/res/font/roboto_lightitalic.ttf | Bin 0 -> 173172 bytes app/src/main/res/font/roboto_medium.ttf | Bin 0 -> 168644 bytes app/src/main/res/font/roboto_mediumitalic.ttf | Bin 0 -> 173416 bytes app/src/main/res/font/roboto_regular.ttf | Bin 0 -> 168260 bytes app/src/main/res/font/roboto_rhinitalic.ttf | Bin 0 -> 172860 bytes app/src/main/res/font/roboto_thin.ttf | Bin 0 -> 168488 bytes app/src/main/res/layout/activity_about1.xml | 68 +++++ app/src/main/res/layout/activity_about2.xml | 66 ++++ app/src/main/res/layout/activity_admin.xml | 32 +- .../res/layout/activity_confirmation_page.xml | 31 +- app/src/main/res/layout/activity_main.xml | 48 ++- .../main/res/layout/activity_product_view.xml | 8 +- app/src/main/res/layout/activity_profile.xml | 285 ++++++++++-------- app/src/main/res/layout/activity_search.xml | 87 ++++-- app/src/main/res/layout/activity_signin.xml | 126 +++++--- app/src/main/res/layout/activity_signup.xml | 189 +++++++----- app/src/main/res/layout/activity_splash.xml | 27 +- app/src/main/res/layout/card_layout.xml | 37 ++- .../main/res/layout/fragment_main_menu.xml | 2 +- app/src/main/res/menu/bottom_nav_menu.xml | 13 +- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/colors.xml | 11 +- app/src/main/res/values/themes.xml | 10 +- 62 files changed, 1030 insertions(+), 339 deletions(-) create mode 100644 app/src/main/java/com/example/thrifty/About1.java create mode 100644 app/src/main/java/com/example/thrifty/About2.java create mode 100644 app/src/main/res/drawable/button1.xml create mode 100644 app/src/main/res/drawable/edit_text_design.xml create mode 100644 app/src/main/res/drawable/edit_text_search.xml create mode 100644 app/src/main/res/drawable/edit_text_shadow.xml create mode 100644 app/src/main/res/drawable/envelope_filled.xml create mode 100644 app/src/main/res/drawable/frame.png create mode 100644 app/src/main/res/drawable/group_5.png create mode 100644 app/src/main/res/drawable/group_8.xml create mode 100644 app/src/main/res/drawable/ic_heart.xml create mode 100644 app/src/main/res/drawable/ic_search_regular.xml create mode 100644 app/src/main/res/drawable/ic_shopping_basket_regular.xml create mode 100644 app/src/main/res/drawable/ic_store_filled.xml create mode 100644 app/src/main/res/drawable/ic_store_regular.xml create mode 100644 app/src/main/res/drawable/ic_user_regular.xml create mode 100644 app/src/main/res/drawable/log_out_filled.xml create mode 100644 app/src/main/res/drawable/logo.png create mode 100644 app/src/main/res/drawable/mask_group.png create mode 100644 app/src/main/res/drawable/money.png create mode 100644 app/src/main/res/drawable/phone_filled.xml create mode 100644 app/src/main/res/drawable/tab_color.xml create mode 100644 app/src/main/res/drawable/vector.png create mode 100644 app/src/main/res/font/fonts.xml create mode 100644 app/src/main/res/font/roboto_black.ttf create mode 100644 app/src/main/res/font/roboto_blackitalic.ttf create mode 100644 app/src/main/res/font/roboto_bold.ttf create mode 100644 app/src/main/res/font/roboto_bolditalic.ttf create mode 100644 app/src/main/res/font/roboto_italic.ttf create mode 100644 app/src/main/res/font/roboto_light.ttf create mode 100644 app/src/main/res/font/roboto_lightitalic.ttf create mode 100644 app/src/main/res/font/roboto_medium.ttf create mode 100644 app/src/main/res/font/roboto_mediumitalic.ttf create mode 100644 app/src/main/res/font/roboto_regular.ttf create mode 100644 app/src/main/res/font/roboto_rhinitalic.ttf create mode 100644 app/src/main/res/font/roboto_thin.ttf create mode 100644 app/src/main/res/layout/activity_about1.xml create mode 100644 app/src/main/res/layout/activity_about2.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 6832d37..53872cd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,6 +3,40 @@