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>

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

@ -1,9 +1,14 @@
<?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">
@ -33,6 +38,7 @@
android:paddingTop="50dp"> android:paddingTop="50dp">
<ImageView <ImageView
android:layout_margin="10dp"
android:id="@+id/avatar" android:id="@+id/avatar"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -66,7 +72,7 @@
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/fio" android:id="@+id/fio"
android:layout_marginTop="10dp" android:layout_margin="10dp"
android:textAlignment="center" android:textAlignment="center"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -93,20 +99,7 @@
<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 <com.google.android.material.button.MaterialButton
android:id="@+id/scan" android:id="@+id/scan"
android:layout_margin="16dp" android:layout_margin="16dp"
@ -142,7 +135,20 @@
android:gravity="center" android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="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 <TextView
android:visibility="gone" android:visibility="gone"
android:id="@+id/error" android:id="@+id/error"
@ -159,5 +165,7 @@
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>