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 14:26:54 +03:00
commit 5d6c6fbe96
3 changed files with 63 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt
View File

@ -47,7 +47,6 @@ class LoginFragment : Fragment(R.layout.fragment_login) {
private fun setupLoginComponents() { private fun setupLoginComponents() {
binding.username.apply { binding.username.apply {
inputType = InputType.TYPE_CLASS_TEXT
addTextChangedListener(object : TextWatcher { addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(s: Editable?) { override fun afterTextChanged(s: Editable?) {
val login = s.toString() val login = s.toString()

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

@ -63,29 +63,26 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_input_login" /> app:layout_constraintTop_toBottomOf="@+id/text_input_login" />
<View <com.google.android.material.textfield.TextInputLayout
android:id="@+id/input_field" android:id="@+id/username_box"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginTop="15dp" android:layout_marginTop="10dp"
android:background="@drawable/button_beigestroke"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.424"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_for" />
<EditText
android:id="@+id/username"
style="@style/NoUnderLineEditText"
android:layout_width="320dp"
android:layout_height="wrap_content"
android:autofillHints=""
android:hint="@string/loginText" android:hint="@string/loginText"
android:paddingStart="10dp" app:boxStrokeColor="@color/white"
android:inputType="text" app:boxStrokeWidth="0dp"
app:layout_constraintBottom_toBottomOf="@+id/input_field" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/input_field" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/input_field" /> app:layout_constraintTop_toBottomOf="@+id/text_for"
>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/button_beigestroke_whitefill" />
</com.google.android.material.textfield.TextInputLayout>
<View <View
android:id="@+id/line" android:id="@+id/line"
@ -167,7 +164,7 @@
android:layout_height="35dp" android:layout_height="35dp"
android:background="@drawable/button_grestroke_whiteback" android:background="@drawable/button_grestroke_whiteback"
app:layout_constraintBottom_toBottomOf="@+id/photo_field" app:layout_constraintBottom_toBottomOf="@+id/photo_field"
app:layout_constraintEnd_toEndOf="@+id/username_field" /> app:layout_constraintStart_toStartOf="@+id/position_field" />
<TextView <TextView
@ -231,7 +228,6 @@
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">

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

@ -20,7 +20,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.19" /> app:layout_constraintGuide_percent="0.15" />
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_bottom" android:id="@+id/guideline_bottom"
@ -34,7 +34,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.45" /> app:layout_constraintGuide_percent="0.47" />
<TextView <TextView
@ -59,67 +59,61 @@
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/textView3"
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/textView" />
<TextView <TextView
android:id="@+id/textView3" android:id="@+id/textView3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:gravity="center" android:gravity="center"
android:text="@string/welcomeDescriptionLoginText" android:text="@string/welcomeDescriptionLoginText"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="15sp" android:textSize="15sp"
app:layout_constraintBottom_toTopOf="@+id/username"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<View
android:id="@+id/field_view"
android:layout_width="320dp"
android:layout_height="40dp"
android:background="@drawable/button_grestroke_whiteback"
app:layout_constraintBottom_toTopOf="@+id/guideline_mid"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<EditText
android:id="@+id/username"
style="@style/NoUnderLineEditText"
android:layout_width="320dp"
android:layout_height="wrap_content"
android:autofillHints=""
android:hint="@string/loginText"
android:inputType="text"
android:padding="12dp"
app:layout_constraintBottom_toBottomOf="@+id/field_view"
app:layout_constraintStart_toStartOf="@+id/field_view"
app:layout_constraintTop_toTopOf="@+id/field_view" />
<View
android:id="@+id/field_view2"
android:layout_width="320dp"
android:layout_height="40dp"
android:layout_marginTop="10dp"
android:background="@drawable/button_grestroke_whiteback"
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/guideline_mid" /> app:layout_constraintTop_toBottomOf="@+id/textView2" />
<EditText <com.google.android.material.textfield.TextInputLayout
android:id="@+id/password" android:id="@+id/username_box"
style="@style/NoUnderLineEditText"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:autofillHints="" android:layout_marginBottom="10dp"
android:hint="@string/loginText"
app:boxStrokeColor="@color/white"
app:boxStrokeWidth="0dp"
app:layout_constraintBottom_toTopOf="@+id/guideline_mid"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/button_beigestroke_whitefill" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/password_box"
android:layout_width="320dp"
android:layout_height="50dp"
android:hint="@string/passwordText" android:hint="@string/passwordText"
android:inputType="textPassword" app:boxStrokeColor="@color/white"
android:padding="12dp" app:boxStrokeWidth="0dp"
app:layout_constraintBottom_toBottomOf="@+id/field_view2" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/field_view2" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/field_view2" /> app:layout_constraintTop_toTopOf="@+id/guideline_mid">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/button_beigestroke_whitefill" />
</com.google.android.material.textfield.TextInputLayout>
<Button <Button
@ -149,23 +143,21 @@
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_marginTop="15dp" android:layout_marginTop="20dp"
android:background="@drawable/ic_line" android:background="@drawable/ic_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/field_view2" /> app:layout_constraintTop_toBottomOf="@+id/password_box" />
<TextView <TextView
android:id="@+id/error" android:id="@+id/error"
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:gravity="center" android:gravity="center"
android:text="@string/loginError" android:text="@string/loginError"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone" android:visibility="gone"
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/field_view2" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>