From d4ca513b6a8624400444e0093a8e80e88d61a38d Mon Sep 17 00:00:00 2001 From: Olga Date: Wed, 17 May 2023 04:03:12 +0700 Subject: [PATCH 01/20] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D1=87=D0=B0=D1=81=D1=82=D1=8C=20=D0=BA=D0=BD?= =?UTF-8?q?=D0=BE=D0=BF=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/button_all_in.xml | 12 - .../main/res/drawable/button_more_options.xml | 12 - .../drawable/button_select_participant.xml | 12 - app/src/main/res/drawable/button_two.xml | 12 - app/src/main/res/drawable/done_button.xml | 12 - .../main/res/drawable/gray_new_expense.xml | 12 - .../main/res/drawable/gray_new_transfer.xml | 12 - app/src/main/res/drawable/login_in.xml | 14 -- app/src/main/res/drawable/new_expense.xml | 14 -- app/src/main/res/drawable/new_transfer.xml | 14 -- app/src/main/res/drawable/sign_up.xml | 14 -- .../main/res/layout/fragment_add_member.xml | 15 +- .../res/layout/fragment_authorization.xml | 41 +-- .../res/layout/fragment_create_expense.xml | 22 +- .../main/res/layout/fragment_create_group.xml | 29 ++- .../res/layout/fragment_create_new_event.xml | 234 ++++++++++-------- .../res/layout/fragment_group_expenses.xml | 2 +- app/src/main/res/layout/fragment_groups.xml | 2 +- .../fragment_select_second_participant.xml | 15 +- app/src/main/res/values-night/themes.xml | 4 +- app/src/main/res/values/strings.xml | 11 +- app/src/main/res/values/themes.xml | 4 +- 22 files changed, 221 insertions(+), 298 deletions(-) delete mode 100644 app/src/main/res/drawable/button_all_in.xml delete mode 100644 app/src/main/res/drawable/button_more_options.xml delete mode 100644 app/src/main/res/drawable/button_select_participant.xml delete mode 100644 app/src/main/res/drawable/button_two.xml delete mode 100644 app/src/main/res/drawable/done_button.xml delete mode 100644 app/src/main/res/drawable/gray_new_expense.xml delete mode 100644 app/src/main/res/drawable/gray_new_transfer.xml delete mode 100644 app/src/main/res/drawable/login_in.xml delete mode 100644 app/src/main/res/drawable/new_expense.xml delete mode 100644 app/src/main/res/drawable/new_transfer.xml delete mode 100644 app/src/main/res/drawable/sign_up.xml diff --git a/app/src/main/res/drawable/button_all_in.xml b/app/src/main/res/drawable/button_all_in.xml deleted file mode 100644 index 40f265e..0000000 --- a/app/src/main/res/drawable/button_all_in.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/button_more_options.xml b/app/src/main/res/drawable/button_more_options.xml deleted file mode 100644 index c47a182..0000000 --- a/app/src/main/res/drawable/button_more_options.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/button_select_participant.xml b/app/src/main/res/drawable/button_select_participant.xml deleted file mode 100644 index 8cc3f6b..0000000 --- a/app/src/main/res/drawable/button_select_participant.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/button_two.xml b/app/src/main/res/drawable/button_two.xml deleted file mode 100644 index 84d3766..0000000 --- a/app/src/main/res/drawable/button_two.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/done_button.xml b/app/src/main/res/drawable/done_button.xml deleted file mode 100644 index 3e93a81..0000000 --- a/app/src/main/res/drawable/done_button.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/gray_new_expense.xml b/app/src/main/res/drawable/gray_new_expense.xml deleted file mode 100644 index baf956c..0000000 --- a/app/src/main/res/drawable/gray_new_expense.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/gray_new_transfer.xml b/app/src/main/res/drawable/gray_new_transfer.xml deleted file mode 100644 index f9ff919..0000000 --- a/app/src/main/res/drawable/gray_new_transfer.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/login_in.xml b/app/src/main/res/drawable/login_in.xml deleted file mode 100644 index 1eb13d1..0000000 --- a/app/src/main/res/drawable/login_in.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/new_expense.xml b/app/src/main/res/drawable/new_expense.xml deleted file mode 100644 index 863df4a..0000000 --- a/app/src/main/res/drawable/new_expense.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/new_transfer.xml b/app/src/main/res/drawable/new_transfer.xml deleted file mode 100644 index c06a1e9..0000000 --- a/app/src/main/res/drawable/new_transfer.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/sign_up.xml b/app/src/main/res/drawable/sign_up.xml deleted file mode 100644 index 5edc9b2..0000000 --- a/app/src/main/res/drawable/sign_up.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app/src/main/res/layout/fragment_add_member.xml b/app/src/main/res/layout/fragment_add_member.xml index fcc19eb..9018f12 100644 --- a/app/src/main/res/layout/fragment_add_member.xml +++ b/app/src/main/res/layout/fragment_add_member.xml @@ -22,14 +22,17 @@ app:layout_constraintTop_toTopOf="parent" /> - - + app:layout_constraintTop_toBottomOf="@+id/personPassword" /> - + app:layout_constraintStart_toStartOf="parent" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_create_expense.xml b/app/src/main/res/layout/fragment_create_expense.xml index cf0b2e2..3aeb690 100644 --- a/app/src/main/res/layout/fragment_create_expense.xml +++ b/app/src/main/res/layout/fragment_create_expense.xml @@ -6,19 +6,23 @@ android:layout_height="match_parent" tools:context=".fragments.CreateExpenseFragment"> - + app:layout_constraintStart_toStartOf="parent" /> - - - + app:layout_constraintStart_toStartOf="parent" /> - - - + + + + - - - - + app:strokeColor="@color/gray" + app:strokeWidth="2dp" /> - - - + app:backgroundTint="#BEDCFF" + app:cornerRadius="10dp" + app:layout_constraintStart_toStartOf="@+id/buttonAll" + app:layout_constraintTop_toBottomOf="@+id/buttonAll" /> + + - @@ -195,14 +239,4 @@ -