DKaverznev/Androck-front
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	app/src/main/res/layout/fragment_admin.xml
This commit is contained in:
DKaverznev 2025-02-20 14:12:27 +03:00
commit 7dcfec695d
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/res/layout/fragment_admin.xml
View File

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto" >
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline" android:id="@+id/guideline"
@ -17,7 +17,16 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintGuide_percent="0.37" /> app:layout_constraintGuide_percent="0.38" />
<ProgressBar
android:id="@+id/loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
<View <View
android:id="@+id/back" android:id="@+id/back"
@ -68,7 +77,7 @@
<EditText <EditText
android:id="@+id/username" android:id="@+id/username"
style="@style/NoUnderLineEditText" style="@style/NoUnderLineEditText"
android:layout_width="wrap_content" android:layout_width="320dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:autofillHints="" android:autofillHints=""
android:hint="@string/loginText" android:hint="@string/loginText"
@ -97,8 +106,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.494" app:layout_constraintHorizontal_bias="0.494"
app:layout_constraintTop_toBottomOf="@+id/line" app:layout_constraintTop_toBottomOf="@+id/line"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
tools:layout_editor_absoluteY="278dp" />
<TextView <TextView
android:id="@+id/username_view" android:id="@+id/username_view"
@ -223,6 +231,7 @@
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="140dp" android:layout_height="140dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/block"> app:layout_constraintTop_toBottomOf="@+id/block">