From fb0a2de1836cd431d153c4bbb8cb72826cca50cd Mon Sep 17 00:00:00 2001 From: veronicagtea Date: Thu, 20 Feb 2025 10:45:23 +0300 Subject: [PATCH] code: Modification Admin screen Modification Scan Result screen --- app/src/main/res/drawable/button_grey.xml | 4 +-- app/src/main/res/drawable/res_success.xml | 32 ++++++------------- app/src/main/res/layout/fragment_admin.xml | 2 +- .../main/res/layout/fragment_scan_result.xml | 8 ++--- app/src/main/res/values/colors.xml | 1 + 5 files changed, 18 insertions(+), 29 deletions(-) diff --git a/app/src/main/res/drawable/button_grey.xml b/app/src/main/res/drawable/button_grey.xml index f51f6ed..d835cbd 100644 --- a/app/src/main/res/drawable/button_grey.xml +++ b/app/src/main/res/drawable/button_grey.xml @@ -1,8 +1,8 @@ - + + android:color="@color/light_grey" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/res_success.xml b/app/src/main/res/drawable/res_success.xml index dfefcb7..ea22ea8 100644 --- a/app/src/main/res/drawable/res_success.xml +++ b/app/src/main/res/drawable/res_success.xml @@ -1,26 +1,14 @@ + android:width="169dp" + android:height="169dp" + android:viewportWidth="169" + android:viewportHeight="169"> + android:pathData="M55.3,3.4c-15.3,5 -24.2,16.8 -25.1,33.2 -0.2,4.4 0.1,10.4 0.7,13.3 1.3,6.3 5.3,15 8.7,19l2.3,2.8 -7.2,3.6c-15.7,7.8 -27.3,22.3 -32.2,40.6 -0.9,3.1 -1.8,10.6 -2.2,16.8 -0.6,11 -0.6,11.2 2,13.5 4.1,3.9 19.6,11.5 30.7,15.2 13.9,4.6 24.4,6 39.4,5.3 13.5,-0.6 23,-2.8 36.5,-8.2 8.3,-3.3 9,-3.4 14.7,-2.4 11.3,2 24.8,-2.5 33.4,-11.1 19.5,-19.5 14,-52 -10.7,-64.2 -8.9,-4.4 -20.1,-5.1 -30.1,-1.9l-6.8,2.2 -5.9,-3.6c-3.3,-2 -7,-3.8 -8.2,-4.1 -2.9,-0.8 -2.9,-1 0.7,-6.4 8.7,-13.1 10.8,-31 5.1,-44.4 -3,-6.8 -10.1,-13.9 -17.4,-17.2 -5,-2.3 -7.9,-2.8 -15.2,-3.1 -5.7,-0.2 -10.5,0.2 -13.2,1.1zM78.1,11.5c9.4,3.2 16.1,11.6 18,22.2 3.4,19.6 -12.9,44.3 -29.2,44.3 -9,-0 -19.9,-9.3 -25.7,-22 -2.9,-6.5 -4.2,-20.5 -2.3,-26.2 3,-9.1 10.1,-16.3 18.2,-18.7 5.3,-1.5 16.1,-1.3 21,0.4zM57.2,84c8,3.6 18.2,2.1 26.6,-3.9 2.7,-1.9 2.8,-1.9 7.7,0.3 2.8,1.2 6.5,3 8.4,4l3.3,1.8 -3.4,3.6c-4.9,5.2 -7.5,9.9 -9.3,16.7 -3.9,15 0.9,30.1 12.8,40.7l4.2,3.7 -3,1.1c-14.4,5.5 -19.6,6.4 -37.5,6.4 -16.1,-0 -18.2,-0.2 -26.5,-2.7 -4.9,-1.5 -14.2,-5.3 -20.5,-8.4l-11.5,-5.8 -0.3,-6.6c-1,-22.2 11.3,-43.2 30.9,-52.8l8.3,-4 2.7,2c1.5,1.1 4.7,2.8 7.1,3.9zM142.5,87.8c6.8,3.3 12.7,9.2 15.9,16.1 3.2,7.1 3,19.9 -0.6,26.6 -3.2,6.2 -10.4,13 -16.6,15.8 -6.5,2.9 -17.9,2.9 -24.4,-0 -6.6,-3 -14.1,-10.4 -16.9,-16.6 -3.2,-7.1 -3.3,-19.1 -0.2,-25.8 3,-6.7 8.6,-12.4 15.5,-15.9 5.2,-2.5 7.3,-3 13.7,-3 6.3,-0 8.6,0.5 13.6,2.8z" + android:fillColor="#000000" + android:strokeColor="#00000000"/> - - - - + android:pathData="M134.5,112l-9.9,9.9 -6.2,-5.9c-3.4,-3.3 -6.7,-6 -7.2,-6 -1.4,-0 -4.2,2.9 -4.2,4.3 0,0.7 3.8,5 8.5,9.7 8.2,8.1 8.5,8.3 11,7 3.4,-1.8 24.5,-23.5 24.5,-25.2 0,-2 -2.1,-3.8 -4.5,-3.8 -1.3,-0 -5.8,3.8 -12,10z" + android:fillColor="#000000" + android:strokeColor="#00000000"/> diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml index 3444646..5aee966 100644 --- a/app/src/main/res/layout/fragment_admin.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -17,7 +17,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.37" /> + app:layout_constraintGuide_percent="0.23" /> + app:layout_constraintGuide_percent="0.65" /> #5C5C5C #C0C0C0 #808080 + #BEBEBE #E9D4C3 \ No newline at end of file