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_main.xml
This commit is contained in:
DKaverznev 2025-02-20 15:14:55 +03:00
commit 281491f880
2 changed files with 9 additions and 30 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

@ -71,17 +71,17 @@
android:hint="@string/loginText" android:hint="@string/loginText"
app:boxStrokeColor="@color/beige" app:boxStrokeColor="@color/beige"
app:boxStrokeWidth="0dp" app:boxStrokeWidth="0dp"
app:layout_constraintBottom_toTopOf="@+id/line"
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/text_for" app:layout_constraintTop_toBottomOf="@+id/text_for">
>
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/username" android:id="@+id/username"
android:layout_width="match_parent" android:layout_width="match_parent"
android:imeOptions="flagNoExtractUi"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/button_beigestroke_whitefill" /> android:background="@drawable/button_beigestroke_whitefill"
android:imeOptions="flagNoExtractUi" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@ -89,11 +89,10 @@
android:id="@+id/line" android:id="@+id/line"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="10dp" android:layout_height="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/ic_line" android:background="@drawable/ic_line"
app:layout_constraintTop_toBottomOf="@+id/guideline2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/guideline2" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout

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

@ -10,7 +10,7 @@
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.35" /> app:layout_constraintGuide_percent="0.36" />
<View <View
android:id="@+id/logout" android:id="@+id/logout"
@ -32,16 +32,6 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/admin2"
android:layout_width="44dp"
android:layout_height="44dp"
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 <View
android:id="@+id/logout2" android:id="@+id/logout2"
android:layout_width="48dp" android:layout_width="48dp"
@ -62,16 +52,6 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/admin"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:background="@drawable/baseline_admin_panel_settings_24"
app:layout_constraintEnd_toStartOf="@+id/refresh"
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"
@ -200,7 +180,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginTop="15dp" android:layout_marginTop="16dp"
android:text="@string/text_scan" android:text="@string/text_scan"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="20sp" android:textSize="20sp"
@ -212,7 +192,7 @@
android:id="@+id/textView8" android:id="@+id/textView8"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="2dp"
android:text="@string/text_qr" android:text="@string/text_qr"
android:textColor="@color/black" android:textColor="@color/black"
app:layout_constraintStart_toStartOf="@+id/text_scan" app:layout_constraintStart_toStartOf="@+id/text_scan"