Merge branch 'Frontend' into Frontend_UI

This commit is contained in:
EgorVorobev 2025-02-19 17:33:56 +03:00
commit d608af144b
2 changed files with 12 additions and 6 deletions

View File

@ -0,0 +1,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#F0F0F0" />
<corners android:radius="16dp" />
</shape>

View File

@ -14,18 +14,18 @@
android:hint="@string/username_hint"
android:inputType="text"
android:padding="12dp"
android:background="#F0F0F0"
android:background="@drawable/ic_android_black_24dp"
android:layout_marginBottom="16dp"/>
<EditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:background="#F0F0F0"
android:hint="@string/password_hint"
android:hint="Введите пароль"
android:inputType="textPassword"
android:padding="12dp" />
android:padding="12dp"
android:background="@drawable/ic_android_black_24dp"
android:layout_marginBottom="16dp"/>
<Button
android:id="@+id/login"
@ -35,6 +35,7 @@
android:backgroundTint="@color/colorPrimary"
android:textColor="@android:color/white"
android:padding="12dp"
app:cornerRadius="16dp"
android:layout_marginBottom="16dp"/>
<TextView
@ -42,7 +43,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:textColor="@android:color/holo_red_dark"
android:textColor="@android:color/holo_red_light"
android:layout_marginBottom="16dp"/>
<ProgressBar