diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 192da5f..0da5aa8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,12 +10,12 @@ val packageName = "ru.myitschool.work" android { namespace = packageName - compileSdk = Version.Android.Sdk.compile + compileSdk = 35 // Обновлено до 35 defaultConfig { applicationId = packageName minSdk = Version.Android.Sdk.min - targetSdk = Version.Android.Sdk.target + targetSdk = 35 // Обновлено до 35 versionCode = 1 versionName = "1.0" diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index 6752e45..a1c6975 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -11,10 +11,9 @@ android:id="@+id/username" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/username_hint" + android:hint="Введите логин" android:inputType="text" android:padding="12dp" - app:CornerRadius="20dp" android:background="#F0F0F0" android:layout_marginBottom="16dp"/> @@ -22,7 +21,7 @@ android:id="@+id/password" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/password_hint" + android:hint="Введите пароль" android:inputType="textPassword" android:padding="12dp" android:background="#F0F0F0" @@ -32,7 +31,7 @@ android:id="@+id/login" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/login_button" + android:text="Войти" android:backgroundTint="@color/colorPrimary" android:textColor="@android:color/white" android:padding="12dp"