Merge branch 'master' of https://gitnto.innovationcampus.ru/DisplayNone/DisplayNone-front
This commit is contained in:
Universall
commit
8a59dc656c
@ -2,13 +2,11 @@
|
||||
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
|
||||
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: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:fillViewport="true"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
@ -17,6 +15,16 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="?android:attr/colorBackground">
|
||||
<ImageButton
|
||||
android:visibility="invisible"
|
||||
android:id="@+id/back_to_search"
|
||||
android:layout_width="50dp"
|
||||
android:padding="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
|
||||
android:src="@drawable/ic_back"
|
||||
android:layout_height="50dp"
|
||||
tools:ignore="MissingConstraints" />
|
||||
<TextView
|
||||
android:padding="15dp"
|
||||
android:visibility="gone"
|
||||
@ -31,34 +39,39 @@
|
||||
android:textColor="?attr/colorOnBackground"
|
||||
android:text="@string/title_profile"
|
||||
tools:ignore="MissingConstraints" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center_horizontal"
|
||||
android:paddingTop="50dp">
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="50dp"
|
||||
tools:layout_editor_absoluteX="0dp"
|
||||
tools:layout_editor_absoluteY="0dp">
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:cardCornerRadius="80dp"
|
||||
|
||||
android:layout_margin="5dp"
|
||||
android:elevation="10dp">
|
||||
|
||||
android:elevation="10dp"
|
||||
app:cardCornerRadius="80dp">
|
||||
|
||||
|
||||
<ImageView
|
||||
android:layout_margin="10dp"
|
||||
android:id="@+id/avatar"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_width="150dp"
|
||||
android:layout_height="150dp"
|
||||
android:foregroundGravity="center"
|
||||
android:importantForAccessibility="no"
|
||||
android:src="@drawable/_user_"
|
||||
<ImageView
|
||||
android:id="@+id/avatar"
|
||||
android:layout_width="150dp"
|
||||
android:layout_height="150dp"
|
||||
android:layout_margin="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:foregroundGravity="center"
|
||||
android:importantForAccessibility="no"
|
||||
android:src="@drawable/_user_"
|
||||
|
||||
|
||||
app:layout_constraintBottom_toTopOf="@+id/title"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintBottom_toTopOf="@+id/title"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<androidx.constraintlayout.helper.widget.Flow
|
||||
@ -78,146 +91,150 @@
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center_horizontal">
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical">
|
||||
|
||||
<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:layout_margin="10dp"
|
||||
android:background="?android:attr/colorBackground"
|
||||
android:letterSpacing="0.05"
|
||||
android:text="Name"
|
||||
android:textAlignment="center"
|
||||
android:textColor="?attr/colorOnBackground"
|
||||
android:text="Name"/>
|
||||
android:textSize="24sp" />
|
||||
|
||||
<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:layout_margin="16dp"
|
||||
|
||||
android:layout_marginTop="10dp"
|
||||
android:background="?android:attr/colorBackground"
|
||||
android:letterSpacing="0.05"
|
||||
android:padding="15dp"
|
||||
android:text="Должность пользователя"
|
||||
android:textAlignment="center"
|
||||
android:textColor="?attr/colorOnBackground"
|
||||
android:text="Должность пользователя" />
|
||||
android:textSize="18sp" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/rights_using_smartphone"
|
||||
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:layout_margin="16dp"
|
||||
|
||||
android:layout_marginTop="10dp"
|
||||
android:background="?android:attr/colorBackground"
|
||||
android:letterSpacing="0.05"
|
||||
android:padding="15dp"
|
||||
android:text="Права с помощью смартфона"
|
||||
android:textAlignment="center"
|
||||
android:textColor="?attr/colorOnBackground"
|
||||
android:text="Права с помощью смартфона" />
|
||||
|
||||
|
||||
android:textSize="18sp" />
|
||||
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/scan"
|
||||
android:layout_margin="16dp"
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/scan"
|
||||
app:icon="@drawable/qr_code_scan"
|
||||
app:iconGravity="textStart"
|
||||
android:visibility="gone"
|
||||
android:padding="12dp"
|
||||
android:textSize="16sp"
|
||||
app:cardElevation="8dp"
|
||||
android:layout_margin="16dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:maxHeight="200dp"
|
||||
|
||||
android:padding="12dp"
|
||||
android:text="@string/scan"
|
||||
android:textColor="@color/white"
|
||||
app:cornerRadius="8dp"
|
||||
android:textSize="16sp"
|
||||
android:visibility="gone"
|
||||
app:backgroundTint="@color/primary"
|
||||
app:rippleColor="@color/white"/>
|
||||
app:cardElevation="8dp"
|
||||
app:cornerRadius="8dp"
|
||||
app:icon="@drawable/qr_code_scan"
|
||||
|
||||
app:iconGravity="textStart"
|
||||
app:rippleColor="@color/white"
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/button_search"
|
||||
app:cardElevation="8dp"
|
||||
android:maxHeight="200dp"
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/administrator_searc_button_search"
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp"
|
||||
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:layout_marginTop="10dp"
|
||||
android:gravity="center"
|
||||
android:maxHeight="200dp"
|
||||
android:padding="12dp"
|
||||
android:text="@string/administrator_searc_button_search"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="16sp"
|
||||
android:visibility="gone"
|
||||
app:backgroundTint="@color/primary"
|
||||
|
||||
|
||||
app:cardElevation="8dp"
|
||||
app:cornerRadius="8dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"/>
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:rippleColor="@color/white"
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp" />
|
||||
|
||||
<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:layout_margin="16dp"
|
||||
android:maxHeight="200dp"
|
||||
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp"
|
||||
android:padding="12dp"
|
||||
|
||||
android:textSize="16sp"
|
||||
android:text="@string/logout"
|
||||
android:textColor="@color/white"
|
||||
app:cornerRadius="8dp"
|
||||
android:textSize="16sp"
|
||||
|
||||
app:backgroundTint="@color/primary"
|
||||
app:rippleColor="@color/white"/>
|
||||
app:cornerRadius="8dp"
|
||||
app:rippleColor="@color/white"
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/change_rights"
|
||||
android:layout_margin="16dp"
|
||||
android:layout_width="match_parent"
|
||||
android:visibility="gone"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/change_rights"
|
||||
android:layout_margin="16dp"
|
||||
android:maxHeight="200dp"
|
||||
|
||||
android:padding="12dp"
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp"
|
||||
app:cardElevation="8dp"
|
||||
android:text="@string/change_rights"
|
||||
|
||||
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/white"
|
||||
app:cornerRadius="8dp"
|
||||
app:backgroundTint="@color/primary"
|
||||
app:rippleColor="@color/white"/>
|
||||
<TextView
|
||||
android:textSize="16sp"
|
||||
android:visibility="gone"
|
||||
app:backgroundTint="@color/primary"
|
||||
|
||||
|
||||
app:cardElevation="8dp"
|
||||
app:cornerRadius="8dp"
|
||||
app:rippleColor="@color/white"
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/error"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content" />
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone" />
|
||||
|
||||
<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" />
|
||||
android:padding="16dp"
|
||||
tools:listitem="@layout/item_scanner_view" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
app:cardElevation="8dp"
|
||||
app:strokeWidth="2dp"
|
||||
app:strokeColor="@color/primary"
|
||||
android:padding="10dp"
|
||||
|
||||
android:backgroundTint="@android:color/white">
|
||||
<LinearLayout
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user