From 130e67dfb7a0bed1357e92a2d87e7a500ebe7639 Mon Sep 17 00:00:00 2001 From: veronicagtea Date: Thu, 20 Feb 2025 15:32:57 +0300 Subject: [PATCH 1/6] code: Modification Scan Result screen --- .../main/res/drawable/{res_success.xml => res_success2.xml} | 0 app/src/main/res/layout/fragment_scan_result.xml | 2 +- app/src/main/res/values/themes.xml | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename app/src/main/res/drawable/{res_success.xml => res_success2.xml} (100%) diff --git a/app/src/main/res/drawable/res_success.xml b/app/src/main/res/drawable/res_success2.xml similarity index 100% rename from app/src/main/res/drawable/res_success.xml rename to app/src/main/res/drawable/res_success2.xml diff --git a/app/src/main/res/layout/fragment_scan_result.xml b/app/src/main/res/layout/fragment_scan_result.xml index 514a126..7745c62 100644 --- a/app/src/main/res/layout/fragment_scan_result.xml +++ b/app/src/main/res/layout/fragment_scan_result.xml @@ -56,7 +56,7 @@ android:id="@+id/success_icon" android:layout_width="230dp" android:layout_height="230dp" - android:background="@drawable/res_success" + android:background="@drawable/res_success2" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/guideline_top" /> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index a594c3e..482d095 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -6,9 +6,9 @@ @color/black @color/white - @color/teal_200 - @color/teal_700 - @color/black + @color/black + @color/black + @color/white ?attr/colorPrimaryVariant From 2101453cafc48486d284206c9bd5c2cbdc040131 Mon Sep 17 00:00:00 2001 From: veronicagtea Date: Thu, 20 Feb 2025 15:33:58 +0300 Subject: [PATCH 2/6] code: Modification Scan Result screen --- app/src/main/res/drawable/{res_success2.xml => res_success.xml} | 0 app/src/main/res/layout/fragment_scan_result.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename app/src/main/res/drawable/{res_success2.xml => res_success.xml} (100%) diff --git a/app/src/main/res/drawable/res_success2.xml b/app/src/main/res/drawable/res_success.xml similarity index 100% rename from app/src/main/res/drawable/res_success2.xml rename to app/src/main/res/drawable/res_success.xml diff --git a/app/src/main/res/layout/fragment_scan_result.xml b/app/src/main/res/layout/fragment_scan_result.xml index 7745c62..514a126 100644 --- a/app/src/main/res/layout/fragment_scan_result.xml +++ b/app/src/main/res/layout/fragment_scan_result.xml @@ -56,7 +56,7 @@ android:id="@+id/success_icon" android:layout_width="230dp" android:layout_height="230dp" - android:background="@drawable/res_success2" + android:background="@drawable/res_success" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/guideline_top" /> From 8e1240177b36aefd04492285f11b1e188ae9c834 Mon Sep 17 00:00:00 2001 From: veronicagtea Date: Thu, 20 Feb 2025 15:38:49 +0300 Subject: [PATCH 3/6] code: Modification Admin screen --- app/src/main/res/layout/fragment_admin.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml index ec8afd7..78327fe 100644 --- a/app/src/main/res/layout/fragment_admin.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -10,14 +10,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.17" /> + app:layout_constraintGuide_percent="0.15" /> + app:layout_constraintGuide_percent="0.37" /> @@ -192,7 +191,7 @@ android:id="@+id/block" android:layout_width="320dp" android:layout_height="80dp" - android:layout_marginTop="40dp" + android:layout_marginTop="35dp" android:background="@drawable/button_grey" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" From f94e5a26efa54499b4ca5f09eca621e0c7b267bd Mon Sep 17 00:00:00 2001 From: veronicagtea Date: Thu, 20 Feb 2025 15:43:05 +0300 Subject: [PATCH 4/6] code: Modification Main screen --- app/src/main/res/drawable/ic_profile.xml | 12 ++++++++++++ app/src/main/res/layout/fragment_main.xml | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/drawable/ic_profile.xml diff --git a/app/src/main/res/drawable/ic_profile.xml b/app/src/main/res/drawable/ic_profile.xml new file mode 100644 index 0000000..e913a71 --- /dev/null +++ b/app/src/main/res/drawable/ic_profile.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index dcb856f..bf1855a 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -10,7 +10,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.36" /> + app:layout_constraintGuide_percent="0.27" /> From 363d3bd7c0139bc5104bf7720e629fcee11a523b Mon Sep 17 00:00:00 2001 From: veronicagtea Date: Thu, 20 Feb 2025 15:45:02 +0300 Subject: [PATCH 5/6] code: Modification Main screen --- app/src/main/res/layout/fragment_main.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index bf1855a..8bda736 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -229,5 +229,4 @@ app:layout_constraintTop_toBottomOf="@+id/scan" /> - \ No newline at end of file From 0770e8d9ec8e23b8ac5b9db7551806460b6fe962 Mon Sep 17 00:00:00 2001 From: veronicagtea Date: Thu, 20 Feb 2025 15:45:32 +0300 Subject: [PATCH 6/6] code: Modification Main screen --- app/src/main/res/layout/fragment_main.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 8bda736..fde3e8d 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -10,7 +10,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.27" /> + app:layout_constraintGuide_percent="0.3" />