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
This commit is contained in:
DKaverznev 2025-02-20 15:21:38 +03:00
commit 998ac8dec2
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,5 +249,18 @@
app:layout_constraintTop_toBottomOf="@+id/scan" /> app:layout_constraintTop_toBottomOf="@+id/scan" />
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/loginError"
android:textSize="14sp"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/username_box"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_for" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/layout/fragment_login.xml
View File

@ -3,7 +3,6 @@
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:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ProgressBar <ProgressBar

31
app/src/main/res/layout/fragment_main.xml
View File

@ -12,16 +12,6 @@
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintGuide_percent="0.36" /> app:layout_constraintGuide_percent="0.36" />
<View
android:id="@+id/logout"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:background="@drawable/icon_exit"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View <View
android:id="@+id/refresh" android:id="@+id/refresh"
android:layout_width="42dp" android:layout_width="42dp"
@ -33,25 +23,24 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<View <View
android:id="@+id/logout2" android:id="@+id/admin"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:background="@drawable/ic_admin"
app:layout_constraintEnd_toStartOf="@+id/refresh"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/logout"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:background="@drawable/icon_exit" android:background="@drawable/icon_exit"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/refresh2"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:background="@drawable/icon_refresh"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View <View
android:id="@+id/icon_profile" android:id="@+id/icon_profile"
android:layout_width="170dp" android:layout_width="170dp"