diff --git a/app/src/main/res/drawable/ic_curveline.xml b/app/src/main/res/drawable/ic_curveline.xml
new file mode 100644
index 0000000..7f6d70a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_curveline.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="379.44dp"
+ android:height="89.71dp"
+ android:viewportWidth="379.44"
+ android:viewportHeight="89.71">
+ <path
+ android:pathData="M350.86,1.74c-11.3,3.6 -29,13.4 -52,28.7 -18.1,12.1 -26.3,18.4 -28.7,22 -1.6,2.5 -1.6,2.7 0.2,4 3.6,2.6 8,0.3 32.3,-16.7 39.4,-27.6 60,-37.5 67.7,-32.5 7,4.6 -0.6,25.4 -14.6,39.6 -21.3,21.7 -58.9,33.2 -113.4,34.7 -37.2,1 -65,-3.9 -113.2,-19.8 -6.8,-2.2 -12.5,-4.4 -12.8,-4.8 -0.2,-0.5 4.2,-4.2 9.8,-8.4 16.7,-12.4 32.2,-29.2 38.8,-41.9 2.1,-4.2 2.4,-5.8 0.9,-5.8 -0.6,-0 -7.9,6.6 -16.3,14.8 -15.7,15.2 -25.7,23.3 -39,31.6l-7.6,4.7 -11.8,-4.6c-23.9,-9.5 -45.7,-14.5 -62.9,-14.5 -16.8,-0 -26.3,4.5 -27.9,13.3 -2.2,11.7 5.7,20.8 22.8,26.3 10.1,3.2 30.6,4.4 43.8,2.4 10.3,-1.4 25.1,-6.1 34.1,-10.6l6.7,-3.4 16.3,5.5c47.1,16.1 75.6,22.1 109.8,23.2 38.8,1.3 73.9,-4.9 100.9,-17.8 21.3,-10.1 36.3,-24.6 42.7,-41.4 2.8,-7.3 2.6,-17.9 -0.4,-22.7 -4.5,-7.3 -14.7,-9.6 -26.2,-5.9zM53.96,42.74c17,3.8 40.9,11.4 40.9,13 0,1.5 -19.3,8.9 -27.4,10.5 -10,2.1 -30.6,2.1 -40,0.1 -13.2,-2.8 -19.7,-7.8 -18.3,-13.7 1.1,-4.1 5.4,-8.5 10,-10.1 6.2,-2.3 24.1,-2.1 34.8,0.2z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml
index 940ed47..44eade3 100644
--- a/app/src/main/res/layout/fragment_admin.xml
+++ b/app/src/main/res/layout/fragment_admin.xml
@@ -69,7 +69,7 @@
android:layout_height="40dp"
android:layout_marginTop="10dp"
android:hint="@string/loginText"
- app:boxStrokeColor="@color/white"
+ app:boxStrokeColor="@color/beige"
app:boxStrokeWidth="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -95,91 +95,98 @@
app:layout_constraintStart_toStartOf="parent" />
- <View
- android:id="@+id/username_field"
- android:layout_width="320dp"
- android:layout_height="40dp"
- android:background="@drawable/button_grestroke_whiteback"
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/constraintLayout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.494"
- app:layout_constraintTop_toBottomOf="@+id/line"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/line">
- <TextView
- android:id="@+id/username_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="15sp"
- android:layout_marginStart="10dp"
- android:text="@string/fullNameText"
- app:layout_constraintBottom_toBottomOf="@+id/username_field"
- app:layout_constraintStart_toStartOf="@+id/username_field"
- app:layout_constraintTop_toTopOf="@+id/username_field"
- android:textColor="@color/black"/>
+ <View
+ android:id="@+id/username_field"
+ android:layout_width="320dp"
+ android:layout_height="40dp"
+ android:background="@drawable/button_grestroke_whiteback"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
- <View
- android:id="@+id/photo_field"
- android:layout_width="80dp"
- android:layout_height="80dp"
- android:layout_marginTop="20dp"
- android:background="@drawable/button_grestroke_whiteback"
- app:layout_constraintStart_toStartOf="@+id/username_field"
- app:layout_constraintTop_toBottomOf="@+id/username_field" />
+ <TextView
+ android:id="@+id/username_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="10dp"
+ android:text="@string/fullNameText"
+ android:textColor="@color/black"
+ android:textSize="15sp"
+ app:layout_constraintBottom_toBottomOf="@+id/username_field"
+ app:layout_constraintStart_toStartOf="@+id/username_field"
+ app:layout_constraintTop_toTopOf="@+id/username_field" />
- <ImageView
- android:id="@+id/photo"
- android:layout_width="79dp"
- android:layout_height="79dp"
- android:layout_gravity="center_horizontal"
- android:contentDescription="@string/contentDescriptionPhoto"
- android:src="@drawable/ic_no_img"
- app:layout_constraintBottom_toBottomOf="@+id/photo_field"
- app:layout_constraintEnd_toEndOf="@+id/photo_field"
- app:layout_constraintStart_toStartOf="@+id/photo_field"
- app:layout_constraintTop_toTopOf="@+id/photo_field" />
+ <View
+ android:id="@+id/photo_field"
+ android:layout_width="80dp"
+ android:layout_height="80dp"
+ android:layout_marginTop="20dp"
+ android:background="@drawable/button_grestroke_whiteback"
+ app:layout_constraintStart_toStartOf="@+id/username_field"
+ app:layout_constraintTop_toBottomOf="@+id/username_field" />
- <View
- android:id="@+id/position_field"
- android:layout_width="220dp"
- android:layout_height="35dp"
- android:background="@drawable/button_grestroke_whiteback"
- app:layout_constraintEnd_toEndOf="@+id/username_field"
- app:layout_constraintTop_toTopOf="@+id/photo_field" />
+ <ImageView
+ android:id="@+id/photo"
+ android:layout_width="79dp"
+ android:layout_height="79dp"
+ android:layout_gravity="center_horizontal"
+ android:contentDescription="@string/contentDescriptionPhoto"
+ android:src="@drawable/ic_no_img"
+ app:layout_constraintBottom_toBottomOf="@+id/photo_field"
+ app:layout_constraintEnd_toEndOf="@+id/photo_field"
+ app:layout_constraintStart_toStartOf="@+id/photo_field"
+ app:layout_constraintTop_toTopOf="@+id/photo_field" />
- <TextView
- android:id="@+id/position"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="10dp"
- android:text="@string/jobText"
- android:textColor="@color/black"
- android:textSize="13sp"
- app:layout_constraintBottom_toBottomOf="@+id/position_field"
- app:layout_constraintStart_toStartOf="@+id/position_field"
- app:layout_constraintTop_toTopOf="@+id/position_field" />
+ <View
+ android:id="@+id/position_field"
+ android:layout_width="220dp"
+ android:layout_height="35dp"
+ android:background="@drawable/button_grestroke_whiteback"
+ app:layout_constraintEnd_toEndOf="@+id/username_field"
+ app:layout_constraintTop_toTopOf="@+id/photo_field" />
- <View
- android:id="@+id/lastEntry_field"
- android:layout_width="220dp"
- android:layout_height="35dp"
- android:background="@drawable/button_grestroke_whiteback"
- app:layout_constraintBottom_toBottomOf="@+id/photo_field"
- app:layout_constraintStart_toStartOf="@+id/position_field" />
+ <TextView
+ android:id="@+id/position"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="10dp"
+ android:text="@string/jobText"
+ android:textColor="@color/black"
+ android:textSize="13sp"
+ app:layout_constraintBottom_toBottomOf="@+id/position_field"
+ app:layout_constraintStart_toStartOf="@+id/position_field"
+ app:layout_constraintTop_toTopOf="@+id/position_field" />
+
+ <View
+ android:id="@+id/lastEntry_field"
+ android:layout_width="220dp"
+ android:layout_height="35dp"
+ android:background="@drawable/button_grestroke_whiteback"
+ app:layout_constraintBottom_toBottomOf="@+id/photo_field"
+ app:layout_constraintStart_toStartOf="@+id/position_field" />
- <TextView
- android:id="@+id/lastEntry"
- android:layout_width="wrap_content"
- android:layout_height="18dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="10dp"
- android:text="@string/lastLoginText"
- android:textColor="@color/black"
- android:textSize="13sp"
- app:layout_constraintBottom_toBottomOf="@+id/lastEntry_field"
- app:layout_constraintStart_toStartOf="@+id/lastEntry_field"
- app:layout_constraintTop_toTopOf="@+id/lastEntry_field"
- app:layout_constraintVertical_bias="0.0" />
+ <TextView
+ android:id="@+id/lastEntry"
+ android:layout_width="wrap_content"
+ android:layout_height="18dp"
+ android:layout_marginStart="8dp"
+ android:text="@string/lastLoginText"
+ android:textColor="@color/black"
+ android:textSize="13sp"
+ app:layout_constraintBottom_toBottomOf="@+id/lastEntry_field"
+ app:layout_constraintStart_toStartOf="@+id/lastEntry_field"
+ app:layout_constraintTop_toTopOf="@+id/lastEntry_field" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id="@+id/block"
@@ -189,7 +196,7 @@
android:background="@drawable/button_grey"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/photo_field" />
+ app:layout_constraintTop_toBottomOf="@+id/constraintLayout" />
<TextView
android:id="@+id/text_block_user"
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index aaf7314..f9b411a 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -20,27 +20,29 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- app:layout_constraintGuide_percent="0.15" />
+ app:layout_constraintGuide_percent="0.3" />
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_bottom"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_percent="0.8" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_mid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- app:layout_constraintGuide_percent="0.47" />
+ app:layout_constraintGuide_percent="0.55" />
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline_bottom"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintGuide_percent="0.7" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
android:gravity="center"
android:text="@string/welcomeText"
android:textColor="@color/black"
@@ -81,7 +83,7 @@
android:layout_height="50dp"
android:layout_marginBottom="10dp"
android:hint="@string/loginText"
- app:boxStrokeColor="@color/white"
+ app:boxStrokeColor="@color/beige"
app:boxStrokeWidth="0dp"
app:layout_constraintBottom_toTopOf="@+id/guideline_mid"
app:layout_constraintEnd_toEndOf="parent"
@@ -101,7 +103,7 @@
android:layout_width="320dp"
android:layout_height="50dp"
android:hint="@string/passwordText"
- app:boxStrokeColor="@color/white"
+ app:boxStrokeColor="@color/beige"
app:boxStrokeWidth="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -119,8 +121,8 @@
<Button
android:id="@+id/login"
android:layout_width="320dp"
- android:layout_height="50dp"
- android:layout_marginTop="40dp"
+ android:layout_height="55dp"
+ android:layout_marginTop="5dp"
android:enabled="false"
android:text="@string/continueText"
android:textAllCaps="false"
@@ -132,22 +134,24 @@
<View
android:id="@+id/ic_building_bottom"
- android:layout_width="wrap_content"
- android:layout_height="120dp"
- android:background="@drawable/ic_building"
- app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_width="320dp"
+ android:layout_height="100dp"
+
+ android:layout_marginBottom="10dp"
+ android:background="@drawable/ic_curveline"
+ app:layout_constraintBottom_toTopOf="@+id/guideline_top"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.494"
app:layout_constraintStart_toStartOf="parent" />
<View
android:id="@+id/line"
android:layout_width="320dp"
android:layout_height="10dp"
- android:layout_marginTop="20dp"
android:background="@drawable/ic_line"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/password_box" />
+ app:layout_constraintTop_toTopOf="@+id/guideline_bottom" />
<TextView
android:id="@+id/error"
@@ -157,7 +161,9 @@
android:text="@string/loginError"
android:textSize="14sp"
android:visibility="gone"
+ app:layout_constraintBottom_toTopOf="@+id/line"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/password_box" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 4a92509..fe2a0f7 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -12,7 +12,6 @@
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.35" />
-
<View
android:id="@+id/logout"
android:layout_width="48dp"
@@ -34,6 +33,35 @@
app:layout_constraintTop_toTopOf="parent" />
+ <View
+ android:id="@+id/admin2"
+ android:layout_width="44dp"
+ android:layout_height="44dp"
+ android:layout_marginTop="20dp"
+ android:layout_marginEnd="20dp"
+ android:background="@drawable/ic_admin"
+ app:layout_constraintEnd_toStartOf="@+id/refresh"
+ app:layout_constraintTop_toTopOf="parent" />/>
+ <View
+ android:id="@+id/logout2"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:layout_marginStart="20dp"
+ android:layout_marginTop="20dp"
+ android:background="@drawable/icon_exit"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <View
+ android:id="@+id/refresh2"
+ android:layout_width="42dp"
+ android:layout_height="42dp"
+ android:layout_marginTop="20dp"
+ android:layout_marginEnd="20dp"
+ android:background="@drawable/icon_refresh"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
<View
android:id="@+id/admin"
android:layout_width="44dp"