From 64bf9567304ea6d7eb5b9b4395cafb4490633173 Mon Sep 17 00:00:00 2001
From: Andrey <an.i.petrow@gmail.com>
Date: Thu, 20 Feb 2025 11:41:36 +0300
Subject: [PATCH] version3.4(added new bottom icon)

---
 .../main/res/drawable/ic_create_employee.png  | Bin 0 -> 505 bytes
 .../ic_create_employee/Add Administrator.png  | Bin 0 -> 505 bytes
 .../main/res/layout/company_info_fragment.xml |  31 ++++++++++--------
 .../res/layout/fragment_redact_profile.xml    |   4 +--
 app/src/main/res/layout/item_user_list.xml    |  12 ++++---
 app/src/main/res/menu/bottom_nav_menu.xml     |   7 ++++
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/styles.xml            |   8 +++++
 8 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_create_employee.png
 create mode 100644 app/src/main/res/ic_create_employee/Add Administrator.png
 create mode 100644 app/src/main/res/values/styles.xml

diff --git a/app/src/main/res/drawable/ic_create_employee.png b/app/src/main/res/drawable/ic_create_employee.png
new file mode 100644
index 0000000000000000000000000000000000000000..add9958b78d9d334448a5b6902798dd3e2bef704
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0gg#TK~#7FrIf!e
z1W^>m&zQ@IfAME63YA78LZ_gm@&q10t)P*30VP_EhtP;15tJen8=anPB(vGZuJ5ex
zX3k7zlAU#uU*^u4JKz1znLAe`9U-s7pu%xLN{6G+2WT4(GK+N;Aq7?79!!7;Y%zBt
zJ;W7wH4A8&ePD^A<5IHpCfKA%HtJwUx(NI751q9O<`(4(;}X=&LcZixicLw0P-hWe
zd;nE22)5-PA4R|N2zZxd%V-<+&7!5l_jC-*avYevZ-t$k8v8+&R3s_4#qqTK^>2Z>
zBk)c44RFD{^P=aH{xgc00ndC{@7E=1OT!w}<O*F4fdO#Lyw53z6!U`4j8*j7JJiIY
zDPNmE3Em_f^^9YeQ$@c{d;)hyOyiUjbSnjtZ1^=U>@tk<x%Rtr!syK-m@}@moLw-_
zHpHep>#$`UM&6Z*zAzc*Oxy!!Ml7#~or5JXrD{^Q%?4OzUi)|pzIY$gt%~VZ`jq4h
vP*Y7Q5q_WDNcuz6DCVSx2+h_105&hbx`A}SLXc4e00000NkvXXu0mjf%kI|k

literal 0
HcmV?d00001

diff --git a/app/src/main/res/ic_create_employee/Add Administrator.png b/app/src/main/res/ic_create_employee/Add Administrator.png
new file mode 100644
index 0000000000000000000000000000000000000000..add9958b78d9d334448a5b6902798dd3e2bef704
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0gg#TK~#7FrIf!e
z1W^>m&zQ@IfAME63YA78LZ_gm@&q10t)P*30VP_EhtP;15tJen8=anPB(vGZuJ5ex
zX3k7zlAU#uU*^u4JKz1znLAe`9U-s7pu%xLN{6G+2WT4(GK+N;Aq7?79!!7;Y%zBt
zJ;W7wH4A8&ePD^A<5IHpCfKA%HtJwUx(NI751q9O<`(4(;}X=&LcZixicLw0P-hWe
zd;nE22)5-PA4R|N2zZxd%V-<+&7!5l_jC-*avYevZ-t$k8v8+&R3s_4#qqTK^>2Z>
zBk)c44RFD{^P=aH{xgc00ndC{@7E=1OT!w}<O*F4fdO#Lyw53z6!U`4j8*j7JJiIY
zDPNmE3Em_f^^9YeQ$@c{d;)hyOyiUjbSnjtZ1^=U>@tk<x%Rtr!syK-m@}@moLw-_
zHpHep>#$`UM&6Z*zAzc*Oxy!!Ml7#~or5JXrD{^Q%?4OzUi)|pzIY$gt%~VZ`jq4h
vP*Y7Q5q_WDNcuz6DCVSx2+h_105&hbx`A}SLXc4e00000NkvXXu0mjf%kI|k

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/company_info_fragment.xml b/app/src/main/res/layout/company_info_fragment.xml
index 64254ae..b2dcfe2 100644
--- a/app/src/main/res/layout/company_info_fragment.xml
+++ b/app/src/main/res/layout/company_info_fragment.xml
@@ -73,7 +73,7 @@
 
     </RelativeLayout>
 
-    <RelativeLayout
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/descriptionLay"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -83,7 +83,8 @@
         android:layout_marginStart="10dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="10dp"
-        android:background="#B1B1CF">
+        android:backgroundTint="#B1B1CF"
+        app:cardCornerRadius="15dp">
 
 
         <ImageView
@@ -115,13 +116,13 @@
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true"
             android:layout_marginStart="50dp"
-            android:layout_marginTop="-54dp"
+            android:layout_marginTop="15dp"
             android:layout_marginEnd="279dp"
             android:text="@string/description" />
 
-    </RelativeLayout>
+    </com.google.android.material.card.MaterialCardView>
 
-    <RelativeLayout
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/workTimeLay"
         android:layout_width="wrap_content"
         android:layout_height="120dp"
@@ -131,7 +132,8 @@
         android:layout_marginStart="10dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="10dp"
-        android:background="#B1B1CF">
+        android:backgroundTint="#B1B1CF"
+        app:cardCornerRadius="15dp">
 
 
         <ImageView
@@ -151,7 +153,7 @@
             android:layout_alignParentTop="true"
             android:layout_alignParentEnd="true"
             android:layout_marginStart="50dp"
-            android:layout_marginTop="37dp"
+            android:layout_marginTop="75dp"
             android:layout_marginEnd="36dp"
             android:maxLines="1" />
 
@@ -163,7 +165,7 @@
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true"
             android:layout_marginStart="50dp"
-            android:layout_marginTop="6dp"
+            android:layout_marginTop="40dp"
             android:layout_marginEnd="36dp"
             android:maxLines="1" />
 
@@ -174,13 +176,13 @@
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true"
             android:layout_marginStart="50dp"
-            android:layout_marginTop="-54dp"
+            android:layout_marginTop="5dp"
             android:layout_marginEnd="270dp"
             android:text="@string/contacts" />
 
-    </RelativeLayout>
+    </com.google.android.material.card.MaterialCardView>
 
-    <RelativeLayout
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/relLay"
         android:layout_width="wrap_content"
         android:layout_height="80dp"
@@ -190,7 +192,8 @@
         android:layout_marginStart="10dp"
         android:layout_marginTop="5dp"
         android:layout_marginEnd="10dp"
-        android:background="#B1B1CF">
+        android:backgroundTint="#B1B1CF"
+        app:cardCornerRadius="15dp">
 
 
         <ImageView
@@ -221,11 +224,11 @@
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true"
             android:layout_marginStart="50dp"
-            android:layout_marginTop="-54dp"
+            android:layout_marginTop="10dp"
             android:layout_marginEnd="301dp"
             android:text="@string/address" />
 
-    </RelativeLayout>
+    </com.google.android.material.card.MaterialCardView>
     </RelativeLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_redact_profile.xml b/app/src/main/res/layout/fragment_redact_profile.xml
index 2c84647..f53144e 100644
--- a/app/src/main/res/layout/fragment_redact_profile.xml
+++ b/app/src/main/res/layout/fragment_redact_profile.xml
@@ -83,7 +83,7 @@
         android:layout_marginEnd="0dp">
 
         <EditText
-            android:id="@+id/fio"
+            android:id="@+id/fio_et"
             android:layout_width="350dp"
             android:layout_height="30dp"
             android:layout_alignParentStart="true"
@@ -109,7 +109,7 @@
             android:id="@+id/role_et"
             android:layout_width="350dp"
             android:layout_height="30dp"
-            android:layout_below="@+id/fio"
+            android:layout_below="@+id/fio_et"
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true"
             android:layout_marginStart="32dp"
diff --git a/app/src/main/res/layout/item_user_list.xml b/app/src/main/res/layout/item_user_list.xml
index 813f38d..1de263e 100644
--- a/app/src/main/res/layout/item_user_list.xml
+++ b/app/src/main/res/layout/item_user_list.xml
@@ -3,15 +3,15 @@
     android:layout_width="match_parent"
     android:layout_height="120dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:cardCornerRadius="8dp"
     app:cardElevation="4dp"
     app:cardBackgroundColor="#B1B1CF"
-    >
+    app:cardCornerRadius="15dp"
+    android:layout_margin="10dp">
 
     <View
-        android:layout_width="10dp"
+        android:layout_width="8dp"
         android:layout_height="120dp"
-        android:layout_marginLeft="273dp"
+        android:layout_marginLeft="265dp"
         android:layout_marginRight="-5dp"
         android:background="#B1CFBB"/>
 
@@ -24,7 +24,9 @@
         <ImageView
             android:layout_width="80dp"
             android:layout_height="80dp"
-            android:id="@+id/profile_image"/>
+            android:id="@+id/profile_image"
+            style="@style/Circle"
+            android:background="@color/black"/>
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index e2ac096..24f4bc9 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -15,6 +15,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+    <item
+        android:id="@+id/createEmployee"
+        android:title="@string/createEmployee"
+        android:icon="@drawable/ic_create_employee"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <item
         android:id="@+id/employees"
         android:title="@string/employees"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc94ce0..488b1b5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,4 +39,5 @@
     <string name="address">Адрес</string>
     <string name="contacts">Контакты</string>
     <string name="description">Описание</string>
+    <string name="createEmployee">Создать сотрудника</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..1364cd4
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Circle"
+        parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">50%</item>
+    </style>
+</resources>
\ No newline at end of file