DisplayNone/DisplayNone-front
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of https://gitnto.innovationcampus.ru/DisplayNone/DisplayNone-front

Browse Source
This commit is contained in:
Izlydov 2025-02-19 13:53:57 +03:00
commit 485abb1d4f
2 changed files with 146 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/fragment_auth.xml
View File

@ -92,7 +92,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="14dp" android:padding="14dp"
android:hint="@string/login" android:hint="@string/password"
android:textColorHint="?attr/colorSecondary" android:textColorHint="?attr/colorSecondary"
android:textColor="?attr/colorSecondary" /> android:textColor="?attr/colorSecondary" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>

282
app/src/main/res/layout/fragment_profile.xml
View File

@ -1,163 +1,171 @@
<?xml version="1.0" encoding="utf-8"?> <?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 <androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/swipeRefresh"
android:fillViewport="true" android:fillViewport="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout <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
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:background="?android:attr/colorBackground">
android:gravity="center_horizontal" <TextView
android:paddingTop="50dp"> android:padding="15dp"
<ImageView
android:id="@+id/avatar"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:id="@+id/title_profile"
android:textAlignment="center"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="150dp" android:layout_height="wrap_content"
android:foregroundGravity="center" android:textSize="20sp"
android:importantForAccessibility="no" android:letterSpacing="0.05"
android:src="@drawable/_user_" android:background="?android:attr/colorBackground"
android:textColor="?attr/colorOnBackground"
app:layout_constraintBottom_toTopOf="@+id/title" android:text="@string/title_profile"
app:layout_constraintTop_toTopOf="parent" /> tools:ignore="MissingConstraints" />
<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" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center_horizontal"> android:gravity="center_horizontal"
android:paddingTop="50dp">
<com.google.android.material.textview.MaterialTextView <ImageView
android:id="@+id/fio" android:layout_margin="10dp"
android:id="@+id/avatar"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:textAlignment="center"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="150dp"
android:textSize="24sp" android:foregroundGravity="center"
android:letterSpacing="0.05" android:importantForAccessibility="no"
android:background="?android:attr/colorBackground" android:src="@drawable/_user_"
android:textColor="?attr/colorOnBackground"
android:text="Name"/>
<com.google.android.material.textview.MaterialTextView app:layout_constraintBottom_toTopOf="@+id/title"
android:id="@+id/position" app:layout_constraintTop_toTopOf="parent" />
android:padding="15dp"
android:layout_margin="16dp"
android:layout_marginTop="10dp"
android:textAlignment="center" <androidx.constraintlayout.helper.widget.Flow
android:layout_width="match_parent" android:id="@+id/flow"
android:layout_height="wrap_content" android:layout_width="0dp"
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"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:orientation="vertical"
tools:listitem="@layout/item_scanner_view" app:constraint_referenced_ids="avatar, fio, next,error, logout"
android:padding="16dp" /> 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>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>