diff --git a/app/src/main/res/layout/fragment_auth.xml b/app/src/main/res/layout/fragment_auth.xml
index ca53562..e6c4e6b 100644
--- a/app/src/main/res/layout/fragment_auth.xml
+++ b/app/src/main/res/layout/fragment_auth.xml
@@ -92,7 +92,7 @@
android:layout_height="wrap_content"
android:padding="14dp"
- android:hint="@string/login"
+ android:hint="@string/password"
android:textColorHint="?attr/colorSecondary"
android:textColor="?attr/colorSecondary" />
</com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index a0f76a0..bc942e2 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -1,163 +1,171 @@
<?xml version="1.0" encoding="utf-8"?>
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/swipeRefresh"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/swipeRefresh"
android:fillViewport="true"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?android:attr/colorBackground">
- <TextView
- android:padding="15dp"
- android:layout_marginTop="10dp"
- android:id="@+id/title_profile"
- android:textAlignment="center"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="20sp"
- android:letterSpacing="0.05"
- android:background="?android:attr/colorBackground"
- android:textColor="?attr/colorOnBackground"
- android:text="@string/title_profile"
- tools:ignore="MissingConstraints" />
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:gravity="center_horizontal"
- android:paddingTop="50dp">
-
- <ImageView
- android:id="@+id/avatar"
+ android:background="?android:attr/colorBackground">
+ <TextView
+ android:padding="15dp"
android:layout_marginTop="10dp"
+ android:id="@+id/title_profile"
+ android:textAlignment="center"
android:layout_width="match_parent"
- android:layout_height="150dp"
- android:foregroundGravity="center"
- android:importantForAccessibility="no"
- android:src="@drawable/_user_"
-
- app:layout_constraintBottom_toTopOf="@+id/title"
- app:layout_constraintTop_toTopOf="parent" />
-
- <androidx.constraintlayout.helper.widget.Flow
- android:id="@+id/flow"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:orientation="vertical"
- app:constraint_referenced_ids="avatar, fio, next,error, logout"
- app:flow_verticalGap="16dp"
- app:flow_verticalStyle="packed"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
-
+ android:layout_height="wrap_content"
+ android:textSize="20sp"
+ android:letterSpacing="0.05"
+ android:background="?android:attr/colorBackground"
+ android:textColor="?attr/colorOnBackground"
+ android:text="@string/title_profile"
+ tools:ignore="MissingConstraints" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:gravity="center_horizontal">
+ android:gravity="center_horizontal"
+ android:paddingTop="50dp">
- <com.google.android.material.textview.MaterialTextView
- android:id="@+id/fio"
+ <ImageView
+ android:layout_margin="10dp"
+ android:id="@+id/avatar"
android:layout_marginTop="10dp"
- android:textAlignment="center"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="24sp"
- android:letterSpacing="0.05"
- android:background="?android:attr/colorBackground"
- android:textColor="?attr/colorOnBackground"
- android:text="Name"/>
+ android:layout_height="150dp"
+ android:foregroundGravity="center"
+ android:importantForAccessibility="no"
+ android:src="@drawable/_user_"
- <com.google.android.material.textview.MaterialTextView
- android:id="@+id/position"
- android:padding="15dp"
- android:layout_margin="16dp"
- android:layout_marginTop="10dp"
+ app:layout_constraintBottom_toTopOf="@+id/title"
+ app:layout_constraintTop_toTopOf="parent" />
- android:textAlignment="center"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="18sp"
- android:letterSpacing="0.05"
- android:background="?android:attr/colorBackground"
- android:textColor="?attr/colorOnBackground"
- android:text="Должность пользователя" />
-
-
-
- <com.google.android.material.button.MaterialButton
- android:id="@+id/logout"
- android:layout_margin="16dp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/logout"
-
- android:padding="12dp"
-
- android:textSize="16sp"
- android:textColor="@color/white"
- app:cornerRadius="8dp"
- app:backgroundTint="@color/primary"
- app:rippleColor="@color/white"/>
- <com.google.android.material.button.MaterialButton
- android:id="@+id/scan"
- android:layout_margin="16dp"
-
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/scan"
- app:icon="@drawable/qr_code_scan"
- app:iconGravity="textStart"
- android:padding="12dp"
- android:textSize="16sp"
- android:layout_marginTop="10dp"
-
- android:textColor="@color/white"
- app:cornerRadius="8dp"
- app:backgroundTint="@color/primary"
- app:rippleColor="@color/white"/>
- <com.google.android.material.button.MaterialButton
- android:id="@+id/button_search"
-
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/administrator_searc_button_search"
- android:padding="12dp"
- android:textSize="16sp"
- android:layout_marginTop="10dp"
- android:layout_margin="16dp"
-
- android:textColor="@color/white"
- app:cornerRadius="8dp"
- app:backgroundTint="@color/primary"
- app:rippleColor="@color/white"
- android:gravity="center"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintTop_toTopOf="parent"/>
-
- <TextView
- android:visibility="gone"
- android:id="@+id/error"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/recyclerViewLogs"
- android:layout_width="match_parent"
+ <androidx.constraintlayout.helper.widget.Flow
+ android:id="@+id/flow"
+ android:layout_width="0dp"
android:layout_height="0dp"
- android:layout_weight="1"
- tools:listitem="@layout/item_scanner_view"
- android:padding="16dp" />
+ android:orientation="vertical"
+ app:constraint_referenced_ids="avatar, fio, next,error, logout"
+ app:flow_verticalGap="16dp"
+ app:flow_verticalStyle="packed"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:gravity="center_horizontal">
+
+ <com.google.android.material.textview.MaterialTextView
+ android:id="@+id/fio"
+ android:layout_margin="10dp"
+ android:textAlignment="center"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="24sp"
+ android:letterSpacing="0.05"
+ android:background="?android:attr/colorBackground"
+ android:textColor="?attr/colorOnBackground"
+ android:text="Name"/>
+
+ <com.google.android.material.textview.MaterialTextView
+ android:id="@+id/position"
+ android:padding="15dp"
+ android:layout_margin="16dp"
+ android:layout_marginTop="10dp"
+
+ android:textAlignment="center"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:letterSpacing="0.05"
+ android:background="?android:attr/colorBackground"
+ android:textColor="?attr/colorOnBackground"
+ android:text="Должность пользователя" />
+
+
+
+
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/scan"
+ android:layout_margin="16dp"
+
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/scan"
+ app:icon="@drawable/qr_code_scan"
+ app:iconGravity="textStart"
+ android:padding="12dp"
+ android:textSize="16sp"
+ android:layout_marginTop="10dp"
+
+ android:textColor="@color/white"
+ app:cornerRadius="8dp"
+ app:backgroundTint="@color/primary"
+ app:rippleColor="@color/white"/>
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/button_search"
+
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/administrator_searc_button_search"
+ android:padding="12dp"
+ android:textSize="16sp"
+ android:layout_marginTop="10dp"
+ android:layout_margin="16dp"
+
+ android:textColor="@color/white"
+ app:cornerRadius="8dp"
+ app:backgroundTint="@color/primary"
+ app:rippleColor="@color/white"
+ android:gravity="center"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toTopOf="parent"/>
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/logout"
+ android:layout_margin="16dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/logout"
+
+ android:padding="12dp"
+
+ android:textSize="16sp"
+ android:textColor="@color/white"
+ app:cornerRadius="8dp"
+ app:backgroundTint="@color/primary"
+ app:rippleColor="@color/white"/>
+ <TextView
+ android:visibility="gone"
+ android:id="@+id/error"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recyclerViewLogs"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ tools:listitem="@layout/item_scanner_view"
+ android:padding="16dp" />
+ </LinearLayout>
</LinearLayout>
- </LinearLayout>
-
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+