From 23c199f022a4b9c46e76548068976e1f268ff229 Mon Sep 17 00:00:00 2001 From: Juja2025 Date: Wed, 19 Feb 2025 12:43:01 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?= =?UTF-8?q?=D0=B8=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE=D1=87=D0=BA=D1=83=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/ic_list.png | Bin 661 -> 0 bytes app/src/main/res/drawable/icon_list.xml | 5 ++ app/src/main/res/layout/card_view.xml | 77 +++++++++++++++++++ app/src/main/res/layout/fragment_profile.xml | 2 +- 4 files changed, 83 insertions(+), 1 deletion(-) delete mode 100644 app/src/main/res/drawable/ic_list.png create mode 100644 app/src/main/res/drawable/icon_list.xml create mode 100644 app/src/main/res/layout/card_view.xml diff --git a/app/src/main/res/drawable/ic_list.png b/app/src/main/res/drawable/ic_list.png deleted file mode 100644 index 646ee044f30aba508d18e6f7a5f62405490b878a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 661 zcmeAS@N?(olHy`uVBq!ia0vp^DImMA-cd1+js_YJ0Y8>cDVlI1a(?s7DRY>Crf1l#CPu{$^y46?DC41Y{a=VNI{y%fh*0eA1QJh|Tf~n?P zvDs(YCZpCnUlq9vR?PXb+3X{T`)1nJ=kF)&`3{y<6A#L~>nv}wVg4yr`()$$sv4ml zOShU&Q9rfX@pDk+k~hC@rUe#VYE59?|5AbL<)@r{N1Z+z9u$TEq?Pua`sO> z$I09mXBnR|mp9oVUUx2SpL4*n3AgQ180)le*IiQsbEARWHocbqH5~U9Gl~?aUW*Of z_hW z^4=_8`&ufess6q78$ZifCVW+z4zX6`7zxc8kP(U7LW9oA6xsVo;6t#B + + + + diff --git a/app/src/main/res/layout/card_view.xml b/app/src/main/res/layout/card_view.xml new file mode 100644 index 0000000..25b65ae --- /dev/null +++ b/app/src/main/res/layout/card_view.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index f371fff..d14ce0f 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -128,7 +128,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="320dp" android:contentDescription="@string/profile_scan_button" - android:src="@drawable/ic_list" + android:src="@drawable/icon_list" app:maxImageSize="30dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> From 9e5f249714d08d15d68736bae8307f7907752219 Mon Sep 17 00:00:00 2001 From: Juja2025 Date: Wed, 19 Feb 2025 13:57:28 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D1=80=D1=83=D0=B3=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8?= =?UTF-8?q?=D0=BD=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D0=B3=D0=BB=D0=B0=D0=B2?= =?UTF-8?q?=D0=BD=D0=BE=D0=BC=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/card_view.xml | 36 ++++++++++++++----- app/src/main/res/layout/fragment_profile.xml | 20 ++++++++--- app/src/main/res/values/card_view_style.xml | 2 +- .../res/values/rounded_image_view_style.xml | 8 +++++ .../main/res/values/strings_entry_list.xml | 4 +++ 5 files changed, 57 insertions(+), 13 deletions(-) create mode 100644 app/src/main/res/values/rounded_image_view_style.xml create mode 100644 app/src/main/res/values/strings_entry_list.xml diff --git a/app/src/main/res/layout/card_view.xml b/app/src/main/res/layout/card_view.xml index 25b65ae..0b6fb6b 100644 --- a/app/src/main/res/layout/card_view.xml +++ b/app/src/main/res/layout/card_view.xml @@ -12,10 +12,10 @@ + + + - - + - + @color/BackgroundGray 0dp - 30dp + 120dp \ No newline at end of file diff --git a/app/src/main/res/values/rounded_image_view_style.xml b/app/src/main/res/values/rounded_image_view_style.xml new file mode 100644 index 0000000..3280455 --- /dev/null +++ b/app/src/main/res/values/rounded_image_view_style.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings_entry_list.xml b/app/src/main/res/values/strings_entry_list.xml new file mode 100644 index 0000000..79bb6db --- /dev/null +++ b/app/src/main/res/values/strings_entry_list.xml @@ -0,0 +1,4 @@ + + + Entry History + \ No newline at end of file From a804b06967f62830fcb011d354c9f2e2f2b5376e Mon Sep 17 00:00:00 2001 From: Juja2025 Date: Wed, 19 Feb 2025 13:57:53 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D1=80=D1=83=D0=B3=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8?= =?UTF-8?q?=D0=BD=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D0=B3=D0=BB=D0=B0=D0=B2?= =?UTF-8?q?=D0=BD=D0=BE=D0=BC=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_profile.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index 3682678..7059bac 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -15,7 +15,7 @@ android:id="@+id/showState" android:layout_width="0dp" android:layout_height="0dp" - app:constraint_referenced_ids="logout,fullname,photo,position,lastEntry,scan" /> + app:constraint_referenced_ids="logout,fullname,photo2,position,lastEntry,scan" />